aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMike Mazur2008-08-19 09:24:12 +0000
committerMike Mazur2008-08-19 09:24:12 +0000
commit894f3045ed970cadcd421df2c3927f3e4160e91f (patch)
tree67bc2ce7914a367d967a60bb233eb21652e3ab63
parentAttachment persistence!!! Patch #9170 (Mantis #1171) (diff)
downloadopensim-SC_OLD-894f3045ed970cadcd421df2c3927f3e4160e91f.zip
opensim-SC_OLD-894f3045ed970cadcd421df2c3927f3e4160e91f.tar.gz
opensim-SC_OLD-894f3045ed970cadcd421df2c3927f3e4160e91f.tar.bz2
opensim-SC_OLD-894f3045ed970cadcd421df2c3927f3e4160e91f.tar.xz
Convert LoadBalancer and RegionProxy plugins to use XML manifests. Fixes
"Plugin Error: Node 'Type' not allowed" messages during region server startup.
-rw-r--r--ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs14
-rw-r--r--ThirdParty/3Di/LoadBalancer/Resources/LoadBalancer.addin.xml12
-rw-r--r--ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs10
-rw-r--r--ThirdParty/3Di/RegionProxy/Resources/RegionProxy.addin.xml11
-rw-r--r--prebuild.xml2
5 files changed, 32 insertions, 17 deletions
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;
45 45
46// TODO: remove LindenUDP dependency 46// TODO: remove LindenUDP dependency
47 47
48[assembly : Addin]
49[assembly : AddinDependency("OpenSim", "0.5")]
50[assembly : AddinDependency("RegionProxy", "0.1")]
51
52namespace OpenSim.ApplicationPlugins.LoadBalancer 48namespace OpenSim.ApplicationPlugins.LoadBalancer
53{ 49{
54 [Extension("/OpenSim/Startup")]
55 [ExtensionNode ("Plugin")]
56 public class LoadBalancerPlugin : IApplicationPlugin 50 public class LoadBalancerPlugin : IApplicationPlugin
57 { 51 {
58 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -76,14 +70,14 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
76 70
77 #region IApplicationPlugin Members 71 #region IApplicationPlugin Members
78 // TODO: required by IPlugin, but likely not at all right 72 // TODO: required by IPlugin, but likely not at all right
79 string m_name = "LoadBalancerPlugin"; 73 string m_name = "LoadBalancer";
80 string m_version = "0.0"; 74 string m_version = "0.1";
81 75
82 public string Version { get { return m_version; } } 76 public string Version { get { return m_version; } }
83 public string Name { get { return m_name; } } 77 public string Name { get { return m_name; } }
84 78
85 public void Initialise() 79 public void Initialise()
86 { 80 {
87 m_log.Info("[BALANCER]: " + Name + " cannot be default-initialized!"); 81 m_log.Info("[BALANCER]: " + Name + " cannot be default-initialized!");
88 throw new PluginNotInitialisedException (Name); 82 throw new PluginNotInitialisedException (Name);
89 } 83 }
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 @@
1<Addin id="LoadBalancer" version="0.1">
2 <Runtime>
3 <Import assembly="OpenSim.ApplicationPlugins.LoadBalancer.dll" />
4 </Runtime>
5 <Dependencies>
6 <Addin id="OpenSim" version="0.5" />
7 <Addin id="RegionProxy" version="0.1" />
8 </Dependencies>
9 <Extension path="/OpenSim/Startup">
10 <Plugin id="LoadBalancer" type="OpenSim.ApplicationPlugins.LoadBalancer.LoadBalancerPlugin" />
11 </Extension>
12</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;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39 39
40[assembly : Addin("RegionProxy", "0.1")]
41[assembly : AddinDependency("OpenSim", "0.5")]
42
43namespace OpenSim.ApplicationPlugins.RegionProxy 40namespace OpenSim.ApplicationPlugins.RegionProxy
44{ 41{
45 /* This module has an interface to OpenSim clients that is constant, and is responsible for relaying 42 /* This module has an interface to OpenSim clients that is constant, and is responsible for relaying
@@ -60,7 +57,6 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
60 * - UnblockClientMessages 57 * - UnblockClientMessages
61 */ 58 */
62 59
63 [Extension("/OpenSim/Startup")]
64 public class RegionProxyPlugin : IApplicationPlugin 60 public class RegionProxyPlugin : IApplicationPlugin
65 { 61 {
66 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 62 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -69,8 +65,8 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
69 65
70 #region IApplicationPlugin Members 66 #region IApplicationPlugin Members
71 // TODO: required by IPlugin, but likely not at all right 67 // TODO: required by IPlugin, but likely not at all right
72 string m_name = "RegionProxyPlugin"; 68 string m_name = "RegionProxy";
73 string m_version = "0.0"; 69 string m_version = "0.1";
74 70
75 public string Version { get { return m_version; } } 71 public string Version { get { return m_version; } }
76 public string Name { get { return m_name; } } 72 public string Name { get { return m_name; } }
@@ -83,7 +79,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
83 79
84 public void Initialise(OpenSimBase openSim) 80 public void Initialise(OpenSimBase openSim)
85 { 81 {
86 m_log.Info("Starting proxy"); 82 m_log.Info("[PROXY] Starting proxy");
87 string proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); 83 string proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", "");
88 if (proxyURL.Length == 0) return; 84 if (proxyURL.Length == 0) return;
89 85
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 @@
1<Addin id="RegionProxy" version="0.1">
2 <Runtime>
3 <Import assembly="OpenSim.ApplicationPlugins.RegionProxy.dll" />
4 </Runtime>
5 <Dependencies>
6 <Addin id="OpenSim" version="0.5" />
7 </Dependencies>
8 <Extension path="/OpenSim/Startup">
9 <Plugin id="RegionProxy" type="OpenSim.ApplicationPlugins.RegionProxy.RegionProxyPlugin" />
10 </Extension>
11</Addin>
diff --git a/prebuild.xml b/prebuild.xml
index 4d27d48..dd4a173 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2122,6 +2122,7 @@
2122 <Reference name="OpenSim.Region.ClientStack"/> 2122 <Reference name="OpenSim.Region.ClientStack"/>
2123 <Files> 2123 <Files>
2124 <Match pattern="*.cs" recurse="true"/> 2124 <Match pattern="*.cs" recurse="true"/>
2125 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
2125 </Files> 2126 </Files>
2126 </Project> 2127 </Project>
2127 2128
@@ -2156,6 +2157,7 @@
2156 <Reference name="libsecondlife.dll"/> 2157 <Reference name="libsecondlife.dll"/>
2157 <Files> 2158 <Files>
2158 <Match pattern="*.cs" recurse="true"/> 2159 <Match pattern="*.cs" recurse="true"/>
2160 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
2159 </Files> 2161 </Files>
2160 </Project> 2162 </Project>
2161 2163