Author: kwall
Date: Sat Nov 26 13:58:26 2016
New Revision: 1771486
URL: http://svn.apache.org/viewvc?rev=1771486&view=rev
Log:
QPID-7551: [Java Broker] Expose Broker version as a virtualhost derived
attribute
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1771486&r1=1771485&r2=1771486&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
Sat Nov 26 13:58:26 2016
@@ -44,6 +44,9 @@ public interface VirtualHost<X extends V
@DerivedAttribute( persist = true )
String getModelVersion();
+ @DerivedAttribute
+ String getProductVersion();
+
@Override
@ManagedOperation(nonModifying = true, changesConfiguredObjectState =
false, associateAsIfChildren = true)
Collection<? extends Connection<?>> getConnections();
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java?rev=1771486&r1=1771485&r2=1771486&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java
Sat Nov 26 13:58:26 2016
@@ -169,6 +169,12 @@ public abstract class AbstractNonConnect
}
@Override
+ public String getProductVersion()
+ {
+ return getAncestor(Broker.class).getProductVersion();
+ }
+
+ @Override
protected <C extends ConfiguredObject> ListenableFuture<C>
addChildAsync(final Class<C> childClass,
final Map<String, Object> attributes,
final ConfiguredObject... otherParents)
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1771486&r1=1771485&r2=1771486&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Sat Nov 26 13:58:26 2016
@@ -2277,6 +2277,12 @@ public abstract class AbstractVirtualHos
}
@Override
+ public String getProductVersion()
+ {
+ return _broker.getProductVersion();
+ }
+
+ @Override
public DurableConfigurationStore getDurableConfigurationStore()
{
return _virtualHostNode.getConfigurationStore();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
