You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/12/07 11:38:15 UTC
[1/2] qpid-broker-j git commit: QPID-8264: [Broker-J] Fix
ClassCastException reported on creation and update of
VirtualHostUserOrConnectionLogInclusionRule
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 8f3f9b1c2 -> 938dc4d73
QPID-8264: [Broker-J] Fix ClassCastException reported on creation and update of VirtualHostUserOrConnectionLogInclusionRule
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/11ca9722
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/11ca9722
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/11ca9722
Branch: refs/heads/master
Commit: 11ca9722c04118172f139915a4867b49c61e345d
Parents: 8f3f9b1
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Dec 7 11:36:47 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Dec 7 11:36:47 2018 +0000
----------------------------------------------------------------------
.../VirtualHostUserOrConnectionLogInclusionRuleImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/11ca9722/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRuleImpl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRuleImpl.java b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRuleImpl.java
index 60db2ff..745b52e 100644
--- a/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRuleImpl.java
+++ b/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRuleImpl.java
@@ -24,10 +24,10 @@ import java.util.Map;
import java.util.Set;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.model.BrokerLogger;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
+import org.apache.qpid.server.model.VirtualHostLogger;
class VirtualHostUserOrConnectionLogInclusionRuleImpl
extends AbstractPredicateLogInclusionRule<VirtualHostUserOrConnectionLogInclusionRuleImpl>
@@ -45,7 +45,7 @@ class VirtualHostUserOrConnectionLogInclusionRuleImpl
@ManagedObjectFactoryConstructor
protected VirtualHostUserOrConnectionLogInclusionRuleImpl(final Map<String, Object> attributes,
- BrokerLogger<?> logger)
+ final VirtualHostLogger<?> logger)
{
super(logger, attributes);
}
@@ -54,8 +54,8 @@ class VirtualHostUserOrConnectionLogInclusionRuleImpl
protected void validateChange(ConfiguredObject<?> proxyForValidation, Set<String> changedAttributes)
{
super.validateChange(proxyForValidation, changedAttributes);
- BrokerUserOrConnectionLogInclusionRule proxy =
- (BrokerUserOrConnectionLogInclusionRule) proxyForValidation;
+ VirtualHostUserOrConnectionLogInclusionRule proxy =
+ (VirtualHostUserOrConnectionLogInclusionRule) proxyForValidation;
if (changedAttributes.contains(LOGGER_NAME) &&
((getLoggerName() != null && !getLoggerName().equals(proxy.getLoggerName())) ||
(getLoggerName() == null && proxy.getLoggerName() != null)))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-broker-j git commit: QPID-7543: [Broker-J] Fix UI for
VirtualHostUserOrConnectionLogInclusionRule
Posted by or...@apache.org.
QPID-7543: [Broker-J] Fix UI for VirtualHostUserOrConnectionLogInclusionRule
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/938dc4d7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/938dc4d7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/938dc4d7
Branch: refs/heads/master
Commit: 938dc4d731a18e37e0b4e31c45fe881eb0c9456b
Parents: 11ca972
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Dec 7 11:37:38 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Dec 7 11:37:38 2018 +0000
----------------------------------------------------------------------
.../virtualhostloginclusionrule/userorconnectionspecific/add.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/938dc4d7/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/userorconnectionspecific/add.js
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/userorconnectionspecific/add.js b/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/userorconnectionspecific/add.js
index f6b3b81..e9d4d89 100644
--- a/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/userorconnectionspecific/add.js
+++ b/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/userorconnectionspecific/add.js
@@ -24,7 +24,7 @@ define(["dojo/dom",
"dijit/registry",
"qpid/common/util",
"dojo/parser",
- "dojo/text!lloginclusionrule/userorconnectionspecific/add.html",
+ "dojo/text!loginclusionrule/userorconnectionspecific/add.html",
"dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
{
var addLogInclusionRule = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org