You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2021/01/19 16:10:20 UTC
[activemq-artemis] branch master updated (86daa7c -> c4cc5ec)
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.
from 86daa7c This closes #3409
new 6b6d993 NO-JIRA updating the console docs
new 9fde07d ARTEMIS-3043 - just a console tweak to add a scrollbar on the column picker modal in case its too big for the screen
new 4a646e4 ARTEMIS-3072 - Management methods check for null and not for empty strings
new c4cc5ec This closes #3410
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/webapp/plugin/css/activemq.css | 4 +++
.../management/impl/ActiveMQServerControlImpl.java | 38 ++++++++++-----------
.../en/images/console-artemis-plugin.png | Bin 430028 -> 177874 bytes
docs/user-manual/en/images/console-login.png | Bin 1062092 -> 997956 bytes
docs/user-manual/en/management-console.md | 10 +++---
5 files changed, 29 insertions(+), 23 deletions(-)
[activemq-artemis] 02/04: ARTEMIS-3043 - just a console tweak to
add a scrollbar on the column picker modal in case its too big for the
screen
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 9fde07dc45f18f7378e350d5a7e14a62b9e1a2ab
Author: Andy Taylor <an...@gmail.com>
AuthorDate: Mon Jan 18 11:30:57 2021 +0000
ARTEMIS-3043 - just a console tweak to add a scrollbar on the column picker modal in case its too big for the screen
https://issues.apache.org/jira/browse/ARTEMIS-3043
---
.../activemq-branding/src/main/webapp/plugin/css/activemq.css | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/activemq.css b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/activemq.css
index ea7b1ab..0e3fb3e 100644
--- a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/activemq.css
+++ b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/css/activemq.css
@@ -2497,3 +2497,7 @@ ng-include > .nav.nav-tabs {
border-right: none;
}
+.modal-body{
+ max-height: calc(100vh - 200px);
+ overflow-y: auto;
+}
\ No newline at end of file
[activemq-artemis] 01/04: NO-JIRA updating the console docs
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 6b6d993a1d7d2d0977b157e11b37e350d7385c4c
Author: Andy Taylor <an...@gmail.com>
AuthorDate: Thu Jan 14 10:53:17 2021 +0000
NO-JIRA updating the console docs
---
.../en/images/console-artemis-plugin.png | Bin 430028 -> 177874 bytes
docs/user-manual/en/images/console-login.png | Bin 1062092 -> 997956 bytes
docs/user-manual/en/management-console.md | 10 ++++++----
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/docs/user-manual/en/images/console-artemis-plugin.png b/docs/user-manual/en/images/console-artemis-plugin.png
index 34036a9..f389d16 100644
Binary files a/docs/user-manual/en/images/console-artemis-plugin.png and b/docs/user-manual/en/images/console-artemis-plugin.png differ
diff --git a/docs/user-manual/en/images/console-login.png b/docs/user-manual/en/images/console-login.png
index 7f243bb..fd12577 100644
Binary files a/docs/user-manual/en/images/console-login.png and b/docs/user-manual/en/images/console-login.png differ
diff --git a/docs/user-manual/en/management-console.md b/docs/user-manual/en/management-console.md
index d0ec2d8..b3f04f6 100644
--- a/docs/user-manual/en/management-console.md
+++ b/docs/user-manual/en/management-console.md
@@ -29,10 +29,12 @@ Once logged in you should be presented with a screen similar to.
On the top right is small menu area you will see some icons.
-- `question mark` This will load the artemis documentation in the console main window
+- `question mark` This will open a menu with the following items
+ - `Help` This will navigate to the console user guide
+ - `About` this will load an about screen, here you will be able to see and validate versions
- `person` will provide a drop down menu with
-- `about` this will load an about screen, here you will be able to see and validate versions
-- `log out` self descriptive.
+ - `Preferences` this will open the preferences page
+ - `Log out` self descriptive.
#### Navigation Tabs
@@ -52,7 +54,7 @@ You can install further hawtio plugins if you wish to have further functionality
## Artemis Tab
-Click `Artemis` in the top navigation bar to see the Artemis specific plugin. (The Artemis tab won't appear if there is no broker in this JVM). The Artemis plugin works very much the same as the JMX plugin however with a focus on interacting with an Artemis broker.
+Click `Artemis` in the left navigation bar to see the Artemis specific plugin. (The Artemis tab won't appear if there is no broker in this JVM). The Artemis plugin works very much the same as the JMX plugin however with a focus on interacting with an Artemis broker.
### Tree View
[activemq-artemis] 03/04: ARTEMIS-3072 - Management methods check
for null and not for empty strings
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 4a646e4415e629840b14bdfbbfa082beaf594f56
Author: Andy Taylor <an...@gmail.com>
AuthorDate: Mon Jan 18 14:41:05 2021 +0000
ARTEMIS-3072 - Management methods check for null and not for empty strings
https://issues.apache.org/jira/browse/ARTEMIS-3072
---
.../management/impl/ActiveMQServerControlImpl.java | 38 +++++++++++-----------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index 2ad2206..46129f0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -1429,9 +1429,9 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
List<String> names = new ArrayList<>();
for (int i = 0; i < queueControls.length; i++) {
QueueControl queueControl = (QueueControl) queueControls[i];
- if (routingType != null && queueControl.getRoutingType().equals(routingType.toUpperCase())) {
+ if (routingType != null && routingType.length() > 1 && queueControl.getRoutingType().equals(routingType.toUpperCase())) {
names.add(queueControl.getName());
- } else if (routingType == null) {
+ } else if (routingType == null || routingType.isEmpty()) {
names.add(queueControl.getName());
}
}
@@ -3418,10 +3418,10 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
addressSettings.setMaxRedeliveryDelay(maxRedeliveryDelay);
addressSettings.setRedistributionDelay(redistributionDelay);
addressSettings.setSendToDLAOnNoRoute(sendToDLAOnNoRoute);
- addressSettings.setAddressFullMessagePolicy(addressFullMessagePolicy == null ? AddressSettings.DEFAULT_ADDRESS_FULL_MESSAGE_POLICY : AddressFullMessagePolicy.valueOf(addressFullMessagePolicy.toUpperCase()));
+ addressSettings.setAddressFullMessagePolicy(addressFullMessagePolicy == null || addressFullMessagePolicy.isEmpty() ? AddressSettings.DEFAULT_ADDRESS_FULL_MESSAGE_POLICY : AddressFullMessagePolicy.valueOf(addressFullMessagePolicy.toUpperCase()));
addressSettings.setSlowConsumerThreshold(slowConsumerThreshold);
addressSettings.setSlowConsumerCheckPeriod(slowConsumerCheckPeriod);
- addressSettings.setSlowConsumerPolicy(slowConsumerPolicy == null ? AddressSettings.DEFAULT_SLOW_CONSUMER_POLICY : SlowConsumerPolicy.valueOf(slowConsumerPolicy.toUpperCase()));
+ addressSettings.setSlowConsumerPolicy(slowConsumerPolicy == null || slowConsumerPolicy.isEmpty() ? AddressSettings.DEFAULT_SLOW_CONSUMER_POLICY : SlowConsumerPolicy.valueOf(slowConsumerPolicy.toUpperCase()));
addressSettings.setAutoCreateJmsQueues(autoCreateJmsQueues);
addressSettings.setAutoDeleteJmsQueues(autoDeleteJmsQueues);
addressSettings.setAutoCreateJmsTopics(autoCreateJmsTopics);
@@ -3430,21 +3430,21 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
addressSettings.setAutoDeleteQueues(autoDeleteQueues);
addressSettings.setAutoCreateAddresses(autoCreateAddresses);
addressSettings.setAutoDeleteAddresses(autoDeleteAddresses);
- addressSettings.setConfigDeleteQueues(configDeleteQueues == null ? AddressSettings.DEFAULT_CONFIG_DELETE_QUEUES : DeletionPolicy.valueOf(configDeleteQueues.toUpperCase()));
- addressSettings.setConfigDeleteAddresses(configDeleteAddresses == null ? AddressSettings.DEFAULT_CONFIG_DELETE_ADDRESSES : DeletionPolicy.valueOf(configDeleteAddresses.toUpperCase()));
+ addressSettings.setConfigDeleteQueues(configDeleteQueues == null || configDeleteQueues.isEmpty() ? AddressSettings.DEFAULT_CONFIG_DELETE_QUEUES : DeletionPolicy.valueOf(configDeleteQueues.toUpperCase()));
+ addressSettings.setConfigDeleteAddresses(configDeleteAddresses == null || configDeleteAddresses.isEmpty() ? AddressSettings.DEFAULT_CONFIG_DELETE_ADDRESSES : DeletionPolicy.valueOf(configDeleteAddresses.toUpperCase()));
addressSettings.setMaxSizeBytesRejectThreshold(maxSizeBytesRejectThreshold);
- addressSettings.setDefaultLastValueKey(defaultLastValueKey == null ? ActiveMQDefaultConfiguration.getDefaultLastValueKey() : new SimpleString(defaultLastValueKey));
+ addressSettings.setDefaultLastValueKey(defaultLastValueKey == null || defaultLastValueKey.isEmpty() ? ActiveMQDefaultConfiguration.getDefaultLastValueKey() : new SimpleString(defaultLastValueKey));
addressSettings.setDefaultNonDestructive(defaultNonDestructive);
addressSettings.setDefaultExclusiveQueue(defaultExclusiveQueue);
addressSettings.setDefaultGroupRebalance(defaultGroupRebalance);
addressSettings.setDefaultGroupBuckets(defaultGroupBuckets);
- addressSettings.setDefaultGroupFirstKey(defaultGroupFirstKey == null ? ActiveMQDefaultConfiguration.getDefaultGroupFirstKey() : new SimpleString(defaultGroupFirstKey));
+ addressSettings.setDefaultGroupFirstKey(defaultGroupFirstKey == null || defaultGroupFirstKey.isEmpty() ? ActiveMQDefaultConfiguration.getDefaultGroupFirstKey() : new SimpleString(defaultGroupFirstKey));
addressSettings.setDefaultMaxConsumers(defaultMaxConsumers);
addressSettings.setDefaultPurgeOnNoConsumers(defaultPurgeOnNoConsumers);
addressSettings.setDefaultConsumersBeforeDispatch(defaultConsumersBeforeDispatch);
addressSettings.setDefaultDelayBeforeDispatch(defaultDelayBeforeDispatch);
- addressSettings.setDefaultQueueRoutingType(defaultQueueRoutingType == null ? ActiveMQDefaultConfiguration.getDefaultRoutingType() : RoutingType.valueOf(defaultQueueRoutingType.toUpperCase()));
- addressSettings.setDefaultAddressRoutingType(defaultAddressRoutingType == null ? ActiveMQDefaultConfiguration.getDefaultRoutingType() : RoutingType.valueOf(defaultAddressRoutingType.toUpperCase()));
+ addressSettings.setDefaultQueueRoutingType(defaultQueueRoutingType == null || defaultQueueRoutingType.isEmpty() ? ActiveMQDefaultConfiguration.getDefaultRoutingType() : RoutingType.valueOf(defaultQueueRoutingType.toUpperCase()));
+ addressSettings.setDefaultAddressRoutingType(defaultAddressRoutingType == null || defaultAddressRoutingType.isEmpty() ? ActiveMQDefaultConfiguration.getDefaultRoutingType() : RoutingType.valueOf(defaultAddressRoutingType.toUpperCase()));
addressSettings.setDefaultConsumerWindowSize(defaultConsumerWindowSize);
addressSettings.setDefaultRingSize(defaultRingSize);
addressSettings.setAutoDeleteCreatedQueues(autoDeleteCreatedQueues);
@@ -3454,11 +3454,11 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
addressSettings.setRedeliveryCollisionAvoidanceFactor(redeliveryCollisionAvoidanceFactor);
addressSettings.setRetroactiveMessageCount(retroactiveMessageCount);
addressSettings.setAutoCreateDeadLetterResources(autoCreateDeadLetterResources);
- addressSettings.setDeadLetterQueuePrefix(deadLetterQueuePrefix == null ? null : new SimpleString(deadLetterQueuePrefix));
- addressSettings.setDeadLetterQueueSuffix(deadLetterQueueSuffix == null ? null : new SimpleString(deadLetterQueueSuffix));
+ addressSettings.setDeadLetterQueuePrefix(deadLetterQueuePrefix == null || deadLetterQueuePrefix.isEmpty() ? null : new SimpleString(deadLetterQueuePrefix));
+ addressSettings.setDeadLetterQueueSuffix(deadLetterQueueSuffix == null || deadLetterQueueSuffix.isEmpty() ? null : new SimpleString(deadLetterQueueSuffix));
addressSettings.setAutoCreateExpiryResources(autoCreateExpiryResources);
- addressSettings.setExpiryQueuePrefix(expiryQueuePrefix == null ? null : new SimpleString(expiryQueuePrefix));
- addressSettings.setExpiryQueueSuffix(expiryQueueSuffix == null ? null : new SimpleString(expiryQueueSuffix));
+ addressSettings.setExpiryQueuePrefix(expiryQueuePrefix == null || expiryQueuePrefix.isEmpty() ? null : new SimpleString(expiryQueuePrefix));
+ addressSettings.setExpiryQueueSuffix(expiryQueueSuffix == null || expiryQueueSuffix.isEmpty() ? null : new SimpleString(expiryQueueSuffix));
addressSettings.setEnableMetrics(enableMetrics);
server.getAddressSettingsRepository().addMatch(address, addressSettings);
@@ -3572,7 +3572,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
clearIO();
try {
- TransformerConfiguration transformerConfiguration = transformerClassName == null ? null : new TransformerConfiguration(transformerClassName).setProperties(transformerProperties);
+ TransformerConfiguration transformerConfiguration = transformerClassName == null || transformerClassName.isEmpty() ? null : new TransformerConfiguration(transformerClassName).setProperties(transformerProperties);
DivertConfiguration config = new DivertConfiguration().setName(name).setRoutingName(routingName).setAddress(address).setForwardingAddress(forwardingAddress).setExclusive(exclusive).setFilterString(filterString).setTransformerConfiguration(transformerConfiguration).setRoutingType(ComponentConfigurationRoutingType.valueOf(routingType));
server.deployDivert(config);
storageManager.storeDivertConfiguration(new PersistedDivertConfiguration(config));
@@ -3597,7 +3597,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
clearIO();
try {
- TransformerConfiguration transformerConfiguration = transformerClassName == null ? null :
+ TransformerConfiguration transformerConfiguration = transformerClassName == null || transformerClassName.isEmpty() ? null :
new TransformerConfiguration(transformerClassName).setProperties(transformerProperties);
DivertConfiguration config = new DivertConfiguration().setName(name).setForwardingAddress(forwardingAddress).
@@ -3763,7 +3763,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
clearIO();
try {
- TransformerConfiguration transformerConfiguration = transformerClassName == null ? null : new TransformerConfiguration(transformerClassName).setProperties(transformerProperties);
+ TransformerConfiguration transformerConfiguration = transformerClassName == null || transformerClassName.isEmpty() ? null : new TransformerConfiguration(transformerClassName).setProperties(transformerProperties);
BridgeConfiguration config = new BridgeConfiguration().setName(name).setQueueName(queueName).setForwardingAddress(forwardingAddress).setFilterString(filterString).setTransformerConfiguration(transformerConfiguration).setClientFailureCheckPeriod(clientFailureCheckPeriod).setRetryInterval(retryInterval).setRetryIntervalMultiplier(retryIntervalMultiplier).setInitialConnectAttempts(initialConnectAttempts).setReconnectAttempts(reconnectAttempts).setUseDuplicateDetection(useDuplicateD [...]
if (useDiscoveryGroup) {
@@ -3807,7 +3807,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
clearIO();
try {
- TransformerConfiguration transformerConfiguration = transformerClassName == null ? null : new TransformerConfiguration(transformerClassName);
+ TransformerConfiguration transformerConfiguration = transformerClassName == null || transformerClassName.isEmpty() ? null : new TransformerConfiguration(transformerClassName);
BridgeConfiguration config = new BridgeConfiguration().setName(name).setQueueName(queueName).setForwardingAddress(forwardingAddress).setFilterString(filterString).setTransformerConfiguration(transformerConfiguration).setClientFailureCheckPeriod(clientFailureCheckPeriod).setRetryInterval(retryInterval).setRetryIntervalMultiplier(retryIntervalMultiplier).setInitialConnectAttempts(initialConnectAttempts).setReconnectAttempts(reconnectAttempts).setUseDuplicateDetection(useDuplicateD [...]
if (useDiscoveryGroup) {
@@ -4355,7 +4355,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
AuditLogger.resetUser(this.server, username, "****", roles, plaintext);
}
- String passwordToUse = password == null ? password : plaintext ? password : PasswordMaskingUtil.getHashProcessor().hash(password);
+ String passwordToUse = password == null || password.isEmpty() ? password : plaintext ? password : PasswordMaskingUtil.getHashProcessor().hash(password);
if (server.getSecurityManager() instanceof ActiveMQBasicSecurityManager) {
((ActiveMQBasicSecurityManager) server.getSecurityManager()).updateUser(username, passwordToUse, roles == null ? null : roles.split(","));
[activemq-artemis] 04/04: This closes #3410
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit c4cc5ec873610bf612b3559a1c451921dc394485
Merge: 86daa7c 4a646e4
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Tue Jan 19 10:09:55 2021 -0600
This closes #3410
.../src/main/webapp/plugin/css/activemq.css | 4 +++
.../management/impl/ActiveMQServerControlImpl.java | 38 ++++++++++-----------
.../en/images/console-artemis-plugin.png | Bin 430028 -> 177874 bytes
docs/user-manual/en/images/console-login.png | Bin 1062092 -> 997956 bytes
docs/user-manual/en/management-console.md | 10 +++---
5 files changed, 29 insertions(+), 23 deletions(-)