Author: orudyy
Date: Tue Feb 9 10:44:45 2016
New Revision: 1729356
URL: http://svn.apache.org/viewvc?rev=1729356&view=rev
Log:
QPID-6932: Rename Broker attribute jVMArguments into jvmArguments and improve
descriptions for Broker injected attributes
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1729356&r1=1729355&r2=1729356&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
Tue Feb 9 10:44:45 2016
@@ -168,7 +168,7 @@ public interface Broker<X extends Broker
long getMaximumDirectMemorySize();
@DerivedAttribute(description = "JVM arguments specified on startup")
- List<String> getJVMArguments();
+ List<String> getJvmArguments();
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
units = StatisticUnit.COUNT,
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java?rev=1729356&r1=1729355&r2=1729356&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
Tue Feb 9 10:44:45 2016
@@ -82,7 +82,7 @@ public class BrokerAttributeInjector imp
"",
false,
"",
- "Maximum size
of memory pool",
+ "Maximum size
of memory pool " + memoryPoolMXBean.getName(),
_typeValidator);
attributes.add(injectedStatistic);
}
@@ -113,7 +113,7 @@ public class BrokerAttributeInjector imp
new ConfiguredObjectInjectedStatistic<>(statisticName,
getMemoryPoolUsed,
new
Object[]{memoryPoolMXBean},
- "Usage of
memory in pool",
+ "Usage of
memory in pool " + memoryPoolMXBean.getName(),
_typeValidator,
StatisticUnit.BYTES,
StatisticType.POINT_IN_TIME,
@@ -139,7 +139,7 @@ public class BrokerAttributeInjector imp
new
ConfiguredObjectInjectedStatistic<>(jvmGCCollectionTimeStatisticName,
getGCCollectionTime,
new
Object[]{garbageCollectorMXBean},
- "Cumulative
time in ms taken by GC to perform collections",
+ "Cumulative
time in ms taken to perform collections for GC " +
garbageCollectorMXBean.getName(),
_typeValidator,
StatisticUnit.COUNT,
StatisticType.CUMULATIVE,
@@ -161,7 +161,7 @@ public class BrokerAttributeInjector imp
new
ConfiguredObjectInjectedStatistic<>(jvmGCCollectionCountStatisticName,
getGCCollectionCount,
new
Object[]{garbageCollectorMXBean},
- "Cumulative
number of GC collections",
+ "Cumulative
number of collections for GC " + garbageCollectorMXBean.getName(),
_typeValidator,
StatisticUnit.COUNT,
StatisticType.CUMULATIVE,
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1729356&r1=1729355&r2=1729356&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Tue Feb 9 10:44:45 2016
@@ -128,7 +128,7 @@ public class BrokerAdapter extends Abstr
private final long _maximumHeapHize = Runtime.getRuntime().maxMemory();
private final long _maximumDirectMemorySize = getMaxDirectMemorySize();
private final BufferPoolMXBean _bufferPoolMXBean;
- private final List<String> _inputArguments;
+ private final List<String> _jvmArguments;
@ManagedObjectFactoryConstructor
public BrokerAdapter(Map<String, Object> attributes,
@@ -173,7 +173,7 @@ public class BrokerAdapter extends Abstr
}
}
_bufferPoolMXBean = bufferPoolMXBean;
- _inputArguments =
ManagementFactory.getRuntimeMXBean().getInputArguments();
+ _jvmArguments =
ManagementFactory.getRuntimeMXBean().getInputArguments();
}
private void updateEncrypter(final String encryptionProviderType)
@@ -1060,9 +1060,9 @@ public class BrokerAdapter extends Abstr
}
@Override
- public List<String> getJVMArguments()
+ public List<String> getJvmArguments()
{
- return _inputArguments;
+ return _jvmArguments;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
