diff options
Diffstat (limited to 'java/broker-plugins/experimental')
5 files changed, 10 insertions, 23 deletions
diff --git a/java/broker-plugins/experimental/info/build.xml b/java/broker-plugins/experimental/info/build.xml index 8f91adc5ff..c5881aa839 100644 --- a/java/broker-plugins/experimental/info/build.xml +++ b/java/broker-plugins/experimental/info/build.xml @@ -20,14 +20,7 @@ nn - or more contributor license agreements. See the NOTICE file --> <project name="AMQ Broker Info Plugin" default="build"> - <condition property="info-plugin.optional.depends" value="bdbstore" else=""> - <and> - <contains string="${modules.opt}" substring="bdbstore"/> - <contains string="${profile}" substring="bdb"/> - </and> - </condition> - - <property name="module.depends" value="common broker broker-plugins ${info-plugin.optional.depends}"/> + <property name="module.depends" value="common broker broker-plugins"/> <property name="module.test.depends" value="test broker/test management/common client systests common/test"/> <property name="module.manifest" value="MANIFEST.MF"/> <property name="module.plugin" value="true"/> diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java b/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java index 21e7be26c1..c7d3fd38ff 100644 --- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java +++ b/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java @@ -59,14 +59,7 @@ public class Activator implements BundleActivator _ctx = ctx; _service = new InfoServiceImpl(); ctx.registerService(InfoService.class.getName(), _service, null); - - new Thread(new Runnable() - { - public void run() - { - sendInfo("STARTUP"); - } - }).start(); + sendInfo("STARTUP"); } } diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java b/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java index c8e9805cd9..a5d267282b 100644 --- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java +++ b/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java @@ -70,13 +70,15 @@ public class AppInfo sc = ApplicationRegistry.getInstance().getConfiguration(); if (null != sc) { - appInfoMap.put("jmxport", sc.getJMXPortRegistryServer() + ""); + appInfoMap.put("jmxport", sc.getJMXManagementPort() + ""); appInfoMap.put("port", sc.getPorts().toString()); appInfoMap.put("version", QpidProperties.getReleaseVersion()); appInfoMap.put("vhosts", "standalone"); - appInfoMap.put("KeystorePath", sc.getConnectorKeyStorePath()); + appInfoMap.put("JMXPrincipalDatabase", sc + .getJMXPrincipalDatabase()); + appInfoMap.put("KeystorePath", sc.getKeystorePath()); appInfoMap.put("PluginDirectory", sc.getPluginDirectory()); - appInfoMap.put("CertType", sc.getConnectorCertType()); + appInfoMap.put("CertType", sc.getCertType()); appInfoMap.put("QpidWork", sc.getQpidWork()); appInfoMap.put("Bind", sc.getBind()); } diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java b/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java index 348e860d5f..156c9eb138 100644 --- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java +++ b/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java @@ -210,13 +210,12 @@ public class InfoPluginTest extends QpidBrokerTestCase } br.close(); System.out.println("*** Received buffer: " + buf); + System.out.println("*** Latch countdown"); + _latch.countDown(); synchronized (_recv) { _recv.add(buf); } - - System.out.println("*** Latch countdown"); - _latch.countDown(); } catch (Exception ex) { diff --git a/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd b/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd index f6ae79536d..6e005f5bdb 100755 --- a/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd +++ b/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.13.0 +ver: 0.9.0 Bundle-SymbolicName: qpid-shutdown-plugin Bundle-Version: ${ver} |