[qpid-broker-j] branch main updated: NO-JIRA: Updated current year for Copyrights in footer.html
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/main by this push: new e09197ff83 NO-JIRA: Updated current year for Copyrights in footer.html e09197ff83 is described below commit e09197ff835b50ba669eed98b3a982938e53d815 Author: Alex Rudyy AuthorDate: Sat Nov 19 18:33:05 2022 + NO-JIRA: Updated current year for Copyrights in footer.html --- broker-plugins/management-http/src/main/java/resources/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/broker-plugins/management-http/src/main/java/resources/footer.html b/broker-plugins/management-http/src/main/java/resources/footer.html index 45515c545c..389696d429 100644 --- a/broker-plugins/management-http/src/main/java/resources/footer.html +++ b/broker-plugins/management-http/src/main/java/resources/footer.html @@ -19,7 +19,7 @@ - --> - 2004-2021 The Apache Software Foundation. + 2004-2022 The Apache Software Foundation. Apache Qpid, Qpid, Apache, the Apache feather logo, and the Apache Qpid project logo are trademarks of The Apache Software Foundation. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8582: [Broker-J] Update dependencies
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git commit 75f1120469559fbe9f5f58f4bb06131f93c41794 Author: dakirily AuthorDate: Mon Apr 11 16:08:40 2022 +0200 QPID-8582: [Broker-J] Update dependencies This closes #123 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 01a4b84aff..17199150a0 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.2.7 30.0-jre 2.13.2 - 2.13.2 + 2.13.2.2 1.7.36 9.4.45.v20220203 @@ -128,13 +128,13 @@ 1.2.1 -4.13 +4.13.2 3.2.4 -4.1.63.Final +4.1.75.Final 2.2 3.5.4 1.1.1 -4.5.3 +4.5.13 0.61.0 6.3.4 2.3.1 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated (00cd847d45 -> 75f1120469)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git from 00cd847d45 NO-JIRA: Upgrade QPID JMS client version (#120) new 6fb8220967 QPID-8580: Upgrade dojotoolkit tpo version 1.16.4 new 75f1120469 QPID-8582: [Broker-J] Update dependencies The 2 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: pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8580: Upgrade dojotoolkit tpo version 1.16.4
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git commit 6fb82209670c60b83949d18ccd35612ab1721d4c Author: Alex Rudyy AuthorDate: Mon Apr 4 20:58:43 2022 +0100 QPID-8580: Upgrade dojotoolkit tpo version 1.16.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01659550cf..01a4b84aff 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ 1.0.35 1.0.13 -1.16.3 +1.16.4 1.1.2 1.2.1 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated (e7ca9f3 -> e2de50b)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from e7ca9f3 QPID-8578: [Broker-J] ACL firewall predicates should be applied to HTTP(S) connections (#119) new ab3668d NO-JIRA: Fix failing tests new e2de50b QPID-8580: [Broker-J] Upgrade Broker-J dependencies to the latest version The 2 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: .../store/berkeleydb/StandardEnvironmentFacadeTest.java | 12 +++- .../replication/ReplicatedEnvironmentFacadeTest.java | 12 .../server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java | 11 +++ pom.xml | 10 +- 4 files changed, 39 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8580: [Broker-J] Upgrade Broker-J dependencies to the latest version
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git commit e2de50b1a57fa567862636a1fd1ce3b7c58c3c7b Author: Alex Rudyy AuthorDate: Wed Mar 30 23:21:46 2022 +0100 QPID-8580: [Broker-J] Upgrade Broker-J dependencies to the latest version --- pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b98d93c..1547fb4 100644 --- a/pom.xml +++ b/pom.xml @@ -104,12 +104,12 @@ 7.4.5 10.14.2.0 -1.2.3 +1.2.7 30.0-jre -2.12.4 - 2.12.4 -1.7.30 -9.4.35.v20201120 +2.13.2 + 2.13.2 +1.7.36 +9.4.45.v20220203 0.7.1.RELEASE - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: NO-JIRA: Fix failing tests
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git commit ab3668d46d535c85bce853c729092504c6a288e7 Author: Alex Rudyy AuthorDate: Wed Mar 30 22:25:40 2022 +0100 NO-JIRA: Fix failing tests --- .../store/berkeleydb/StandardEnvironmentFacadeTest.java | 12 +++- .../replication/ReplicatedEnvironmentFacadeTest.java | 12 .../server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java | 11 +++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java index 9522dd3..1a8db6c 100644 --- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java +++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java @@ -23,6 +23,10 @@ package org.apache.qpid.server.store.berkeleydb; import static org.apache.qpid.server.store.berkeleydb.EnvironmentFacade.JUL_LOGGER_LEVEL_OVERRIDE; import static org.apache.qpid.server.store.berkeleydb.EnvironmentFacade .LOG_HANDLER_CLEANER_PROTECTED_FILES_LIMIT_PROPERTY_NAME; +import static org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost.DEFAULT_QPID_BROKER_BDB_COMMITER_NOTIFY_THRESHOLD; +import static org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost.DEFAULT_QPID_BROKER_BDB_COMMITER_WAIT_TIMEOUT; +import static org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost.QPID_BROKER_BDB_COMMITER_NOTIFY_THRESHOLD; +import static org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost.QPID_BROKER_BDB_COMMITER_WAIT_TIMEOUT; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertNotNull; @@ -32,6 +36,7 @@ import static org.junit.Assert.fail; import static org.junit.Assume.assumeThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -174,7 +179,12 @@ public class StandardEnvironmentFacadeTest extends UnitTestBase any(), eq(JUL_LOGGER_LEVEL_OVERRIDE), any())).thenReturn(Collections.emptyMap()); - +when(sec.getFacadeParameter(eq(Integer.class), + eq(QPID_BROKER_BDB_COMMITER_NOTIFY_THRESHOLD), + anyInt())).thenReturn(DEFAULT_QPID_BROKER_BDB_COMMITER_NOTIFY_THRESHOLD); +when(sec.getFacadeParameter(eq(Long.class), +eq(QPID_BROKER_BDB_COMMITER_WAIT_TIMEOUT), + anyLong())).thenReturn(DEFAULT_QPID_BROKER_BDB_COMMITER_WAIT_TIMEOUT); return new StandardEnvironmentFacade(sec); } diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java index 3c0af4b..d95f377 100644 --- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java +++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java @@ -23,6 +23,10 @@ package org.apache.qpid.server.store.berkeleydb.replication; import static org.apache.qpid.server.store.berkeleydb.EnvironmentFacade.JUL_LOGGER_LEVEL_OVERRIDE; import static org.apache.qpid.server.store.berkeleydb.EnvironmentFacade.LOG_HANDLER_CLEANER_PROTECTED_FILES_LIMIT_PROPERTY_NAME; import static org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade.*; +import static org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost.DEFAULT_QPID_BROKER_BDB_COMMITER_NOTIFY_THRESHOLD; +import static org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost.DEFAULT_QPID_BROKER_BDB_COMMITER_WAIT_TIMEOUT; +import static org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost.QPID_BROKER_BDB_COMMITER_NOTIFY_THRESHOLD; +import static org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost.QPID_BROKER_BDB_COMMITER_WAIT_TIMEOUT; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; @@ -36,6 +40,7 @@ import static org.junit.Assume.assumeThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt
[qpid-broker-j] branch main updated: QPID-8568: [Broker-J] Context variables disappear from All list in GUI context editor
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 8864869 QPID-8568: [Broker-J] Context variables disappear from All
list in GUI context editor
8864869 is described below
commit 886486962147e4bbecf41a8a280026c580ce4644
Author: Marek Laca
AuthorDate: Tue Oct 26 14:07:03 2021 +0200
QPID-8568: [Broker-J] Context variables disappear from All list in GUI
context editor
This closes #112
---
.../js/qpid/common/ContextVariablesEditor.js | 29 ++
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git
a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
index 24c681a..cbcdea1 100644
---
a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
+++
b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
@@ -159,7 +159,6 @@ define(["qpid/common/util",
{
that._onEdit(inRowIndex);
});
-grid.startup();
this._filterBox = registry.byNode(query(".filter",
this.domNode)[0]);
this._filterBox.on("change", function (value)
{
@@ -169,9 +168,26 @@ define(["qpid/common/util",
}
});
},
+startup: function()
+{
+this.inherited(arguments);
+this._grid.startup();
+this._filter(this._filterBox.value);
+},
resize: function ()
{
-this._grid.render();
+if (this._onResizeHandle)
+{
+this._onResizeHandle.remove();
+}
+const that = this;
+this._onResizeHandle = this.defer(function ()
+{
+that._onResizeHandle = null;
+that._grid.setQuery({"inherited": that._filterBox.value});
+that._grid.sort();
+that._grid.update();
+});
},
setData: function (actualValues, allEffectiveValues,
inheritedActualValues)
{
@@ -215,8 +231,9 @@ define(["qpid/common/util",
grid.store.newItem(storeItem);
}
grid.store.save();
+grid.sort();
+grid.render();
}
-this._filter(this._filterBox.value);
this._handleOnChange(actualValues);
},
addInheritedContext: function (object)
@@ -257,7 +274,8 @@ define(["qpid/common/util",
}
}
grid.store.save();
-this._filter(this._filterBox.value);
+grid.sort();
+grid.render();
}
},
removeDynamicallyAddedInheritedContext: function ()
@@ -327,6 +345,7 @@ define(["qpid/common/util",
},
onChange: function (newValue)
{
+this.inherited(arguments);
},
_newItem: function ()
{
@@ -434,7 +453,7 @@ define(["qpid/common/util",
},
_filter: function (value)
{
-this._grid.filter({"inherited": value});
+this._grid.filter({"inherited": value}, true);
},
_nextId: function ()
{
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated: QPID-8565: [Broker-J] Enhancement of ACL rule predicates evaluation
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 0ecc652 QPID-8565: [Broker-J] Enhancement of ACL rule predicates
evaluation
0ecc652 is described below
commit 0ecc652fb6767b6a48a3b3018cf2f88e405ad015
Author: Marek Laca
AuthorDate: Mon Nov 1 10:50:34 2021 +0100
QPID-8565: [Broker-J] Enhancement of ACL rule predicates evaluation
This closes #113
---
.../security/access/config/AclRulePredicates.java | 25 +-
.../access/config/AclRulePredicatesBuilder.java| 35 ++-
.../security/access/config/RuleCollector.java | 28 +-
.../security/access/config/RulePredicate.java | 65 -
.../access/config/predicates/AnyValue.java | 1 -
.../access/config/predicates/AttributeNames.java | 7 +-
.../security/access/config/predicates/Equal.java | 1 -
.../config/predicates/RulePredicateBuilder.java| 105 +++
.../access/config/predicates/WildCard.java | 1 -
.../access/firewall/AbstractFirewallRuleImpl.java | 5 +-
.../security/access/config/AclFileParserTest.java | 10 +
.../predicates/RulePredicateBuilderTest.java | 308 +
12 files changed, 495 insertions(+), 96 deletions(-)
diff --git
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
index 3d4cad4..de222fd 100644
---
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
+++
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
@@ -23,16 +23,15 @@ import java.util.Collection;
import java.util.Collections;
import java.util.EnumMap;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import javax.security.auth.Subject;
-import
org.apache.qpid.server.security.access.config.predicates.RulePredicateBuilder;
import org.apache.qpid.server.security.access.firewall.FirewallRuleFactory;
import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
public final class AclRulePredicates extends AbstractMap>
@@ -54,29 +53,15 @@ public final class AclRulePredicates extends
AbstractMap>
AclRulePredicates(AclRulePredicatesBuilder builder)
{
super();
-_properties = newProperties(builder);
-_rulePredicate =
RulePredicateBuilder.build(builder.getParsedProperties());
+_properties = Objects.requireNonNull(builder.newProperties());
+_rulePredicate = Objects.requireNonNull(builder.newRulePredicate());
}
AclRulePredicates(FirewallRuleFactory factory, AclRulePredicatesBuilder
builder)
{
super();
-_properties = newProperties(builder);
-_rulePredicate = RulePredicateBuilder.build(factory,
builder.getParsedProperties());
-}
-
-private Map> newProperties(AclRulePredicatesBuilder
builder)
-{
-final Map> properties = new
EnumMap<>(Property.class);
-for (final Map.Entry> entry :
builder.getParsedProperties().entrySet())
-{
-final Set values = entry.getValue();
-if (values != null && !values.isEmpty())
-{
-properties.put(entry.getKey(),
ImmutableSet.builder().addAll(values).build());
-}
-}
-return properties;
+_properties = Objects.requireNonNull(builder.newProperties());
+_rulePredicate =
Objects.requireNonNull(builder.newRulePredicate(factory));
}
public Map getParsedProperties()
diff --git
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicatesBuilder.java
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicatesBuilder.java
index a05317f..bd9d57a 100644
---
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicatesBuilder.java
+++
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicatesBuilder.java
@@ -27,8 +27,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import
org.apache.qpid.server.security.access.config.predicates.RulePredicateBuilder;
import org.apache.qpid.server.security.access.firewall.FirewallRuleFactory;
+import com.google.common.collect.ImmutableSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -123,6 +125,16 @@ public final class AclRulePredicatesBuilder
{
_attribute
[qpid-broker-j] branch main updated (3f553ff -> 935108a)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from 3f553ff QPID-8563: [Broker-J] Purge all queues (#109)
new b3cd5a5 QPID-8565: [Broker-J] Enhancement of ACL rule predicates
evaluation
new 935108a QPID-8565: [Broker-J] Tidy-up ACL refactoring
The 2 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:
.../server/security/access/config/AclAction.java | 106
.../security/access/config/AclFileParser.java | 54 +-
.../security/access/config/AclRulePredicates.java | 207
.../access/config/AclRulePredicatesBuilder.java| 199 +++
.../qpid/server/security/access/config/Action.java | 164 --
.../security/access/config/ClientAction.java | 74 ---
.../security/access/config/FirewallRule.java | 25 +-
.../access/config/LegacyAccessControlAdapter.java | 89 ++--
.../security/access/config/ObjectProperties.java | 249 +++--
.../access/config/OperationLoggingDetails.java | 89
.../server/security/access/config/Property.java| 98
.../qpid/server/security/access/config/Rule.java | 275 --
.../{RuleSetCreator.java => RuleCollector.java}| 113 ++--
.../security/access/config/RulePredicate.java | 66 +++
.../server/security/access/config/RuleSet.java | 27 +-
.../security/access/config}/package-info.java | 2 +-
.../predicates/AnyValue.java} | 42 +-
.../predicates/AttributeNames.java}| 43 +-
.../AclRule.java => config/predicates/Equal.java} | 45 +-
.../config/predicates/RulePredicateBuilder.java| 103
.../access/config/predicates/WildCard.java | 55 ++
.../access/config/predicates}/package-info.java| 2 +-
.../access/firewall/AbstractFirewallRuleImpl.java | 25 +-
.../firewall/AccessControlFirewallException.java | 2 +-
.../access/firewall/FirewallRuleFactory.java | 7 +-
.../access/firewall/HostnameFirewallRule.java | 70 ++-
.../access/firewall/NetworkFirewallRule.java | 52 +-
.../security/access/firewall}/package-info.java| 2 +-
...stractCommonRuleBasedAccessControlProvider.java | 112 ++--
.../server/security/access/plugins/AclRule.java| 4 +-
.../security/access/plugins/RuleOutcome.java | 1 -
.../security/access/config/AclActionTest.java | 109
.../security/access/config/AclFileParserTest.java | 258 +
.../access/config/AclRulePredicatesTest.java | 304 +--
.../server/security/access/config/ActionTest.java | 138 -
.../security/access/config/ClientActionTest.java | 128 -
.../security/access/config/FirewallRuleTest.java | 57 --
.../config/LegacyAccessControlAdapterTest.java | 174 +++---
.../access/config/ObjectPropertiesTest.java| 277 ++
.../security/access/config/PropertyTest.java | 81 +++
.../access/config/RuleBasedAccessControlTest.java | 164 --
.../security/access/config/RuleCollectorTest.java | 104
.../security/access/config/RuleSetCreatorTest.java | 99
.../server/security/access/config/RuleSetTest.java | 586 ++---
.../server/security/access/config/RuleTest.java| 439 ++-
.../config/predicates/RulePredicateTest.java | 404 ++
.../config/predicates/TestFirewallRule.java} | 18 +-
.../security/access/firewall/FirewallRuleTest.java | 79 +++
.../security/access/plugins/AclRuleImplTest.java | 56 --
.../RuleBasedAccessControlProviderImplTest.java| 15 +-
.../jms_1_1/extensions/acl/MessagingACLTest.java | 32 +-
51 files changed, 3633 insertions(+), 2291 deletions(-)
delete mode 100644
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclAction.java
create mode 100644
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicatesBuilder.java
delete mode 100644
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java
delete mode 100644
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ClientAction.java
delete mode 100644
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/OperationLoggingDetails.java
create mode 100644
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Property.java
rename
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/{RuleSetCreator.java
=> RuleCollector.java} (53%)
create mode 100644
broker-plugins/access-control/src/main/java/org/apache/qpid/
[qpid-broker-j] 02/02: QPID-8565: [Broker-J] Tidy-up ACL refactoring
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 935108a8fa093e71fee13385dc2a0c94348eeb5c
Author: Alex Rudyy
AuthorDate: Mon Nov 1 01:20:09 2021 +
QPID-8565: [Broker-J] Tidy-up ACL refactoring
This closes #110
---
.../config/{predicates => }/AclRulePredicates.java | 14 ++---
.../{predicates => }/AclRulePredicatesBuilder.java | 13 +
.../access/{firewall => config}/FirewallRule.java | 8 +--
.../qpid/server/security/access/config/Rule.java | 21 +++
.../security/access/config/RuleCollector.java | 1 -
.../security/access/config/RulePredicate.java | 66 ++
.../config/predicates/AbstractPredicate.java | 48
.../config/predicates/{Some.java => AnyValue.java} | 27 ++---
.../access/config/predicates/AttributeNames.java | 21 ++-
.../security/access/config/predicates/Equal.java | 27 ++---
...ulePredicate.java => RulePredicateBuilder.java} | 60 +++-
.../access/config/predicates/WildCard.java | 26 ++---
.../access/firewall/AbstractFirewallRuleImpl.java | 30 +-
.../access/firewall/FirewallRuleFactory.java | 2 +
.../access/firewall/HostnameFirewallRule.java | 15 -
.../access/firewall/NetworkFirewallRule.java | 16 +-
.../security/access/config/AclFileParserTest.java | 12
.../{predicates => }/AclRulePredicatesTest.java| 23 ++--
.../access/config/RuleBasedAccessControlTest.java | 2 -
.../server/security/access/config/RuleSetTest.java | 1 -
.../server/security/access/config/RuleTest.java| 1 -
.../access/config/predicates/TestFirewallRule.java | 2 +-
.../security/access/firewall/FirewallRuleTest.java | 27 -
23 files changed, 137 insertions(+), 326 deletions(-)
diff --git
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/predicates/AclRulePredicates.java
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
similarity index 88%
rename from
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/predicates/AclRulePredicates.java
rename to
broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
index fd304eb..3d4cad4 100644
---
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/predicates/AclRulePredicates.java
+++
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpid.server.security.access.config.predicates;
+package org.apache.qpid.server.security.access.config;
import java.util.AbstractMap;
import java.util.Collection;
@@ -28,9 +28,7 @@ import java.util.stream.Collectors;
import javax.security.auth.Subject;
-import org.apache.qpid.server.security.access.config.LegacyOperation;
-import org.apache.qpid.server.security.access.config.ObjectProperties;
-import org.apache.qpid.server.security.access.config.Property;
+import
org.apache.qpid.server.security.access.config.predicates.RulePredicateBuilder;
import org.apache.qpid.server.security.access.firewall.FirewallRuleFactory;
import com.google.common.base.Joiner;
@@ -57,14 +55,14 @@ public final class AclRulePredicates extends
AbstractMap>
{
super();
_properties = newProperties(builder);
-_rulePredicate = RulePredicate.build(builder.getParsedProperties());
+_rulePredicate =
RulePredicateBuilder.build(builder.getParsedProperties());
}
AclRulePredicates(FirewallRuleFactory factory, AclRulePredicatesBuilder
builder)
{
super();
_properties = newProperties(builder);
-_rulePredicate = RulePredicate.build(factory,
builder.getParsedProperties());
+_rulePredicate = RulePredicateBuilder.build(factory,
builder.getParsedProperties());
}
private Map> newProperties(AclRulePredicatesBuilder
builder)
@@ -104,9 +102,9 @@ public final class AclRulePredicates extends
AbstractMap>
}
@Override
-public boolean test(LegacyOperation operation, ObjectProperties
objectProperties, Subject subject)
+public boolean matches(LegacyOperation operation, ObjectProperties
objectProperties, Subject subject)
{
-return _rulePredicate.test(operation, objectProperties, subject);
+return _rulePredicate.matches(operation, objectProperties, subject);
}
@Override
diff --git
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/predicates/AclRulePredicatesBuilder.java
b/broker-plugins/access-control/src/main/
[qpid-broker-j] 01/02: QPID-8548: [Broker-J] Enhance ACL file loading and parsing
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit a8545b2f4b00fdb859578a295e1f346f57426d2d
Author: Marek Laca
AuthorDate: Fri Sep 10 20:42:51 2021 +0200
QPID-8548: [Broker-J] Enhance ACL file loading and parsing
This closes #107
---
.../security/access/config/AclFileParser.java | 461 -
.../security/access/config/RuleSetCreator.java | 100 +++--
.../security/access/config/AclFileParserTest.java | 461 +++--
.../security/access/config/RuleSetCreatorTest.java | 69 +++
4 files changed, 724 insertions(+), 367 deletions(-)
diff --git
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
index 0662691..08ee994 100644
---
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
+++
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
@@ -20,31 +20,40 @@
*/
package org.apache.qpid.server.security.access.config;
+import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.logging.EventLoggerProvider;
+import org.apache.qpid.server.security.Result;
+import org.apache.qpid.server.security.access.plugins.RuleOutcome;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.BufferedReader;
-import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StreamTokenizer;
import java.net.MalformedURLException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayDeque;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
+import java.util.Locale;
import java.util.Map;
-import java.util.Stack;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.EventLoggerProvider;
-import org.apache.qpid.server.security.Result;
-import org.apache.qpid.server.security.access.plugins.RuleOutcome;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
public final class AclFileParser
{
private static final Logger LOGGER =
LoggerFactory.getLogger(AclFileParser.class);
+
public static final String DEFAULT_ALLOW = "defaultallow";
public static final String DEFAULT_DEFER = "defaultdefer";
public static final String DEFAULT_DENY = "defaultdeny";
@@ -54,71 +63,76 @@ public final class AclFileParser
public static final String ACL = "acl";
private static final String CONFIG = "config";
+private static final String GROUP = "GROUP";
-private static final String UNRECOGNISED_INITIAL_MSG = "Unrecognised
initial token '%s' at line %d";
+static final String UNRECOGNISED_INITIAL_MSG = "Unrecognised initial token
'%s' at line %d";
static final String NOT_ENOUGH_TOKENS_MSG = "Not enough tokens at line %d";
-private static final String NUMBER_NOT_ALLOWED_MSG = "Number not allowed
before '%s' at line %d";
-private static final String CANNOT_LOAD_MSG = "I/O Error while reading
configuration";
+static final String NUMBER_NOT_ALLOWED_MSG = "Number not allowed before
'%s' at line %d";
+static final String CANNOT_LOAD_MSG = "I/O Error while reading
configuration";
static final String PREMATURE_CONTINUATION_MSG = "Premature continuation
character at line %d";
-private static final String PREMATURE_EOF_MSG = "Premature end of file
reached at line %d";
static final String PARSE_TOKEN_FAILED_MSG = "Failed to parse token at
line %d";
static final String NOT_ENOUGH_ACL_MSG = "Not enough data for an acl at
line %d";
-private static final String NOT_ENOUGH_CONFIG_MSG = "Not enough data for
config at line %d";
-private static final String BAD_ACL_RULE_NUMBER_MSG = "Invalid rule number
at line %d";
+static final String NOT_ENOUGH_CONFIG_MSG = "Not enough data for config at
line %d";
+static final String BAD_ACL_RULE_NUMBER_MSG = "Invalid rule number at line
%d";
static final String PROPERTY_KEY_ONLY_MSG = "Incomplete property (key
only) at line %d";
static final String PROPERTY_NO_EQUALS_MSG = "Inc
[qpid-broker-j] 02/02: QPID-8548: [Broker-J] Fix import order and formatting
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 967cf84e047a08070f31f6fc5a0ed743618cf137
Author: Alex Rudyy
AuthorDate: Sun Sep 19 20:41:17 2021 +0100
QPID-8548: [Broker-J] Fix import order and formatting
---
.../security/access/config/AclFileParser.java | 31 ++--
.../security/access/config/AclFileParserTest.java | 156 -
.../security/access/config/RuleSetCreatorTest.java | 52 +--
3 files changed, 146 insertions(+), 93 deletions(-)
diff --git
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
index 08ee994..ded49e9 100644
---
a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
+++
b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
@@ -20,13 +20,6 @@
*/
package org.apache.qpid.server.security.access.config;
-import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.EventLoggerProvider;
-import org.apache.qpid.server.security.Result;
-import org.apache.qpid.server.security.access.plugins.RuleOutcome;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -50,6 +43,14 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.logging.EventLoggerProvider;
+import org.apache.qpid.server.security.Result;
+import org.apache.qpid.server.security.access.plugins.RuleOutcome;
+
public final class AclFileParser
{
private static final Logger LOGGER =
LoggerFactory.getLogger(AclFileParser.class);
@@ -378,13 +379,17 @@ public final class AclFileParser
return parseEnum(OBJECT_TYPE_MAP, text, line, "object type");
}
-private > T parseEnum(final Map map, final
String text, final int line, final String typeDescription)
+private > T parseEnum(final Map map,
+final String text,
+final int line,
+final String typeDescription)
{
-return Optional.ofNullable(
-map.get(text.toUpperCase(Locale.ENGLISH))
-).orElseThrow(
-() -> new
IllegalConfigurationException(String.format(PARSE_TOKEN_FAILED_MSG, line),
-new
IllegalArgumentException(String.format(INVALID_ENUM, typeDescription, text;
+return Optional.ofNullable(map.get(text.toUpperCase(Locale.ENGLISH)))
+ .orElseThrow(() -> new
IllegalConfigurationException(String.format(PARSE_TOKEN_FAILED_MSG, line),
+
new IllegalArgumentException(String.format(
+
INVALID_ENUM,
+
typeDescription,
+
text;
}
private Reader getReaderFromURLString(String urlString)
diff --git
a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclFileParserTest.java
b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclFileParserTest.java
index 7cc1d0b..c1203ca 100644
---
a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclFileParserTest.java
+++
b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclFileParserTest.java
@@ -18,13 +18,12 @@
*/
package org.apache.qpid.server.security.access.config;
-import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.EventLoggerProvider;
-import org.apache.qpid.server.security.Result;
-import org.apache.qpid.server.security.access.config.ObjectProperties.Property;
-import org.apache.qpid.test.utils.UnitTestBase;
-import org.junit.Test;
-import org.mockito.Mockito;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
import java.io.File;
import java.io.FileWriter;
@@ -
[qpid-broker-j] branch main updated (d711a17 -> 967cf84)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from d711a17 NO-JIRA: Update Qpid JMS client to version 0.59.0 new a8545b2 QPID-8548: [Broker-J] Enhance ACL file loading and parsing new 967cf84 QPID-8548: [Broker-J] Fix import order and formatting The 2 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: .../security/access/config/AclFileParser.java | 450 - .../security/access/config/RuleSetCreator.java | 100 +++-- .../security/access/config/AclFileParserTest.java | 441 +++- .../security/access/config/RuleSetCreatorTest.java | 99 + 4 files changed, 750 insertions(+), 340 deletions(-) create mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleSetCreatorTest.java - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r49669 - /release/qpid/broker-j/8.0.5/
Author: orudyy Date: Sun Aug 29 19:10:10 2021 New Revision: 49669 Log: Remove distribution bundles for Qpid Broker-J 8.0.5 Removed: release/qpid/broker-j/8.0.5/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r49664 - /release/qpid/broker-j/8.0.4/
Author: orudyy Date: Sat Aug 28 18:44:07 2021 New Revision: 49664 Log: Remove Apache Qpid Broker-J 8.0.4 Removed: release/qpid/broker-j/8.0.4/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r49663 - /release/qpid/broker-j/8.0.6/
Author: orudyy Date: Sat Aug 28 18:29:46 2021 New Revision: 49663 Log: Apache Qpid Broker-J 8.0.6 Added: release/qpid/broker-j/8.0.6/ - copied from r49662, dev/qpid/broker-j/8.0.6-rc1/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated: NO-JIRA: Update Qpid JMS client to version 0.59.0
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/main by this push: new d711a17 NO-JIRA: Update Qpid JMS client to version 0.59.0 d711a17 is described below commit d711a172ba1801ef97a4e6668c8e2b11feb001c0 Author: Alex Rudyy AuthorDate: Tue Aug 24 23:54:04 2021 +0100 NO-JIRA: Update Qpid JMS client to version 0.59.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1eacc38..b98d93c 100644 --- a/pom.xml +++ b/pom.xml @@ -130,12 +130,12 @@ 4.13 3.2.4 -4.1.51.Final +4.1.63.Final 2.2 3.5.4 1.1.1 4.5.3 -0.54.0 +0.59.0 6.3.4 2.3.1 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r49626 - in /dev/qpid/broker-j/8.0.6-rc1: ./ binaries/
Author: orudyy Date: Tue Aug 24 20:19:50 2021 New Revision: 49626 Log: Apache Qpid Broker-J 8.0.6 RC1 Added: dev/qpid/broker-j/8.0.6-rc1/ dev/qpid/broker-j/8.0.6-rc1/apache-qpid-broker-j-8.0.6-src.tar.gz (with props) dev/qpid/broker-j/8.0.6-rc1/apache-qpid-broker-j-8.0.6-src.tar.gz.asc (with props) dev/qpid/broker-j/8.0.6-rc1/apache-qpid-broker-j-8.0.6-src.tar.gz.sha512 dev/qpid/broker-j/8.0.6-rc1/binaries/ dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.tar.gz (with props) dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.tar.gz.asc (with props) dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.tar.gz.sha512 dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.zip (with props) dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.zip.asc (with props) dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.zip.sha512 Added: dev/qpid/broker-j/8.0.6-rc1/apache-qpid-broker-j-8.0.6-src.tar.gz == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.6-rc1/apache-qpid-broker-j-8.0.6-src.tar.gz -- svn:mime-type = application/gzip Added: dev/qpid/broker-j/8.0.6-rc1/apache-qpid-broker-j-8.0.6-src.tar.gz.asc == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.6-rc1/apache-qpid-broker-j-8.0.6-src.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/qpid/broker-j/8.0.6-rc1/apache-qpid-broker-j-8.0.6-src.tar.gz.sha512 == --- dev/qpid/broker-j/8.0.6-rc1/apache-qpid-broker-j-8.0.6-src.tar.gz.sha512 (added) +++ dev/qpid/broker-j/8.0.6-rc1/apache-qpid-broker-j-8.0.6-src.tar.gz.sha512 Tue Aug 24 20:19:50 2021 @@ -0,0 +1 @@ +a490952e9a19ddc6f47024bdf96cf064926a319befef5f8528caf2ff9864a37668109ce0361ccf82215125aed3434183da16e2ddaa553d313eb1d1c4d05ecf04 apache-qpid-broker-j-8.0.6-src.tar.gz Added: dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.tar.gz == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.tar.gz -- svn:mime-type = application/gzip Added: dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.tar.gz.asc == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.tar.gz.sha512 == --- dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.tar.gz.sha512 (added) +++ dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.tar.gz.sha512 Tue Aug 24 20:19:50 2021 @@ -0,0 +1 @@ +6dc44b5a26b5e7e5890ced3d9a19e222cd90245381e333c2d32d0903c56212e2328e489644ded2291bd2982e33c528df8b9e42032ee35b372d099e85afcdae5b apache-qpid-broker-j-8.0.6-bin.tar.gz Added: dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.zip == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.zip -- svn:mime-type = application/zip Added: dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.zip.asc == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.zip.sha512 == --- dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.zip.sha512 (added) +++ dev/qpid/broker-j/8.0.6-rc1/binaries/apache-qpid-broker-j-8.0.6-bin.zip.sha512 Tue Aug 24 20:19:50 2021 @@ -0,0 +1
svn commit: r49625 - in /dev/qpid/broker-j: 7.0.8-rc1/ 7.0.9-rc1/ 7.1.10-rc1/ 7.1.11-rc1/ 7.1.12-rc1/ 7.1.8-rc1/ 7.1.9-rc1/ 8.0.0-rc1/ 8.0.1-rc1/ 8.0.2-rc1/ 8.0.3-rc1/ 8.0.4-rc1/
Author: orudyy Date: Tue Aug 24 20:09:49 2021 New Revision: 49625 Log: Remove old release candidate binaries for Qpid Broker-J Removed: dev/qpid/broker-j/7.0.8-rc1/ dev/qpid/broker-j/7.0.9-rc1/ dev/qpid/broker-j/7.1.10-rc1/ dev/qpid/broker-j/7.1.11-rc1/ dev/qpid/broker-j/7.1.12-rc1/ dev/qpid/broker-j/7.1.8-rc1/ dev/qpid/broker-j/7.1.9-rc1/ dev/qpid/broker-j/8.0.0-rc1/ dev/qpid/broker-j/8.0.1-rc1/ dev/qpid/broker-j/8.0.2-rc1/ dev/qpid/broker-j/8.0.3-rc1/ dev/qpid/broker-j/8.0.4-rc1/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/8.0.x by this push: new 5f11661 [maven-release-plugin] prepare for next development iteration 5f11661 is described below commit 5f11661b528e6442bd36c2e5231c3178aa399571 Author: Alex Rudyy AuthorDate: Tue Aug 24 20:48:01 2021 +0100 [maven-release-plugin] prepare for next development iteration --- apache-qpid-broker-j/pom.xml | 2 +- bdbstore/pom.xml | 2 +- bdbstore/systests/pom.xml| 2 +- broker-codegen/pom.xml | 2 +- broker-core/pom.xml | 2 +- broker-plugins/access-control/pom.xml| 2 +- broker-plugins/amqp-0-10-protocol/pom.xml| 2 +- broker-plugins/amqp-0-8-protocol/pom.xml | 2 +- broker-plugins/amqp-1-0-bdb-store/pom.xml| 2 +- broker-plugins/amqp-1-0-jdbc-store/pom.xml | 2 +- broker-plugins/amqp-1-0-protocol/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml | 2 +- broker-plugins/derby-store/pom.xml | 2 +- broker-plugins/jdbc-logging-logback/pom.xml | 2 +- broker-plugins/jdbc-provider-bone/pom.xml| 2 +- broker-plugins/jdbc-store/pom.xml| 2 +- broker-plugins/logging-logback/pom.xml | 2 +- broker-plugins/management-amqp/pom.xml | 2 +- broker-plugins/management-http/pom.xml | 2 +- broker-plugins/memory-store/pom.xml | 2 +- broker-plugins/prometheus-exporter/pom.xml | 2 +- broker-plugins/websocket/pom.xml | 2 +- broker/pom.xml | 2 +- doc/developer-guide/pom.xml | 2 +- doc/java-broker/pom.xml | 2 +- doc/java-perftests/pom.xml | 2 +- doc/pom.xml | 2 +- joramtests/pom.xml | 2 +- perftests/pom.xml| 2 +- perftests/visualisation-jfc/pom.xml | 2 +- pom.xml | 4 ++-- qpid-perftests-systests/pom.xml | 2 +- qpid-systests-parent/pom.xml | 4 ++-- qpid-test-utils/pom.xml | 2 +- systests/end-to-end-conversion-tests/pom.xml | 2 +- systests/protocol-tests-amqp-0-10/pom.xml| 2 +- systests/protocol-tests-amqp-0-8/pom.xml | 2 +- systests/protocol-tests-amqp-1-0/pom.xml | 2 +- systests/protocol-tests-core/pom.xml | 2 +- systests/qpid-systests-http-management/pom.xml | 2 +- systests/qpid-systests-jms-core/pom.xml | 2 +- systests/qpid-systests-jms_1.1/pom.xml | 2 +- systests/qpid-systests-jms_2.0/pom.xml | 2 +- systests/qpid-systests-spawn-admin/pom.xml | 2 +- systests/systests-utils/pom.xml | 2 +- tck/pom.xml | 2 +- tools/pom.xml| 2 +- 49 files changed, 51 insertions(+), 51 deletions(-) diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml index ef4bce0..70d51a4 100644 --- a/apache-qpid-broker-j/pom.xml +++ b/apache-qpid-broker-j/pom.xml @@ -18,7 +18,7 @@ org.apache.qpid qpid-broker-parent -8.0.6 +8.0.7-SNAPSHOT 4.0.0 diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml index 2229ed8..27d4e2d 100644 --- a/bdbstore/pom.xml +++ b/bdbstore/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.6 +8.0.7-SNAPSHOT qpid-bdbstore diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml index 4d77176..1ebaffd 100644 --- a/bdbstore/systests/pom.xml +++ b/bdbstore/systests/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-systests-parent -8.0.6 +8.0.7-SNAPSHOT ../../qpid-systests-parent/pom.xml diff --git a/broker-codegen/pom.xml b/broker-codegen/pom.xml index febddc6..224a9fb 100644 --- a/broker-codegen/pom.xml +++ b/broker-codegen/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.6 +8.0.7-SNAPSHOT qpid-broker-codegen diff --git a/broker-core/pom.xml b/broker-core/pom.xml index 383ed52..d1171a5 100644 --- a/broker-core/pom.xml +++ b/broker-core/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.6 +8.0.7-SNAPSHOT qpid-broker-core diff --git a/broker-plugins/access-control/pom.xml b/broker-plugins/access-control/pom.xml index e7ad76f..36afcbc 100644 --- a/broker-plugins/access-control/pom.xml +++ b/broker-plugins/access-control/pom.xml @@ -21,7 +21,7
[qpid-broker-j] annotated tag 8.0.6 created (now 4c34e1d)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to annotated tag 8.0.6 in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. at 4c34e1d (tag) tagging 1bd1c16b2a7f2743a947ee4a4acd4d62f2ab65ba (commit) replaces 8.0.5 by Alex Rudyy on Tue Aug 24 20:47:57 2021 +0100 - Log - [maven-release-plugin] copy for tag 8.0.6 --- No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated: [maven-release-plugin] prepare release 8.0.6
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/8.0.x by this push: new 1bd1c16 [maven-release-plugin] prepare release 8.0.6 1bd1c16 is described below commit 1bd1c16b2a7f2743a947ee4a4acd4d62f2ab65ba Author: Alex Rudyy AuthorDate: Tue Aug 24 20:47:38 2021 +0100 [maven-release-plugin] prepare release 8.0.6 --- apache-qpid-broker-j/pom.xml | 2 +- bdbstore/pom.xml | 2 +- bdbstore/systests/pom.xml| 2 +- broker-codegen/pom.xml | 2 +- broker-core/pom.xml | 2 +- broker-plugins/access-control/pom.xml| 2 +- broker-plugins/amqp-0-10-protocol/pom.xml| 2 +- broker-plugins/amqp-0-8-protocol/pom.xml | 2 +- broker-plugins/amqp-1-0-bdb-store/pom.xml| 2 +- broker-plugins/amqp-1-0-jdbc-store/pom.xml | 2 +- broker-plugins/amqp-1-0-protocol/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml | 2 +- broker-plugins/derby-store/pom.xml | 2 +- broker-plugins/jdbc-logging-logback/pom.xml | 2 +- broker-plugins/jdbc-provider-bone/pom.xml| 2 +- broker-plugins/jdbc-store/pom.xml| 2 +- broker-plugins/logging-logback/pom.xml | 2 +- broker-plugins/management-amqp/pom.xml | 2 +- broker-plugins/management-http/pom.xml | 2 +- broker-plugins/memory-store/pom.xml | 2 +- broker-plugins/prometheus-exporter/pom.xml | 2 +- broker-plugins/websocket/pom.xml | 2 +- broker/pom.xml | 2 +- doc/developer-guide/pom.xml | 2 +- doc/java-broker/pom.xml | 2 +- doc/java-perftests/pom.xml | 2 +- doc/pom.xml | 2 +- joramtests/pom.xml | 2 +- perftests/pom.xml| 2 +- perftests/visualisation-jfc/pom.xml | 2 +- pom.xml | 4 ++-- qpid-perftests-systests/pom.xml | 2 +- qpid-systests-parent/pom.xml | 4 ++-- qpid-test-utils/pom.xml | 2 +- systests/end-to-end-conversion-tests/pom.xml | 2 +- systests/protocol-tests-amqp-0-10/pom.xml| 2 +- systests/protocol-tests-amqp-0-8/pom.xml | 2 +- systests/protocol-tests-amqp-1-0/pom.xml | 2 +- systests/protocol-tests-core/pom.xml | 2 +- systests/qpid-systests-http-management/pom.xml | 2 +- systests/qpid-systests-jms-core/pom.xml | 2 +- systests/qpid-systests-jms_1.1/pom.xml | 2 +- systests/qpid-systests-jms_2.0/pom.xml | 2 +- systests/qpid-systests-spawn-admin/pom.xml | 2 +- systests/systests-utils/pom.xml | 2 +- tck/pom.xml | 2 +- tools/pom.xml| 2 +- 49 files changed, 51 insertions(+), 51 deletions(-) diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml index 6f56976..ef4bce0 100644 --- a/apache-qpid-broker-j/pom.xml +++ b/apache-qpid-broker-j/pom.xml @@ -18,7 +18,7 @@ org.apache.qpid qpid-broker-parent -8.0.6-SNAPSHOT +8.0.6 4.0.0 diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml index 28886d9..2229ed8 100644 --- a/bdbstore/pom.xml +++ b/bdbstore/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.6-SNAPSHOT +8.0.6 qpid-bdbstore diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml index c0f111d..4d77176 100644 --- a/bdbstore/systests/pom.xml +++ b/bdbstore/systests/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-systests-parent -8.0.6-SNAPSHOT +8.0.6 ../../qpid-systests-parent/pom.xml diff --git a/broker-codegen/pom.xml b/broker-codegen/pom.xml index c3ab944..febddc6 100644 --- a/broker-codegen/pom.xml +++ b/broker-codegen/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.6-SNAPSHOT +8.0.6 qpid-broker-codegen diff --git a/broker-core/pom.xml b/broker-core/pom.xml index 62af2cb..383ed52 100644 --- a/broker-core/pom.xml +++ b/broker-core/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.6-SNAPSHOT +8.0.6 qpid-broker-core diff --git a/broker-plugins/access-control/pom.xml b/broker-plugins/access-control/pom.xml index 34c6b47..e7ad76f 100644 --- a/broker-plugins/access-control/pom.xml +++ b/broker-plugins/access-control/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid
[qpid-broker-j] branch 8.0.x updated: QPID-8530: [Broker-J] Duplicated functionality of the Selector::wakeup method in SelectorThread
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 36d21f1 QPID-8530: [Broker-J] Duplicated functionality of the
Selector::wakeup method in SelectorThread
36d21f1 is described below
commit 36d21f1ed4606277b2ba59586a9e87e930a9715e
Author: Marek Laca
AuthorDate: Thu Jun 3 22:52:54 2021 +0200
QPID-8530: [Broker-J] Duplicated functionality of the Selector::wakeup
method in SelectorThread
This closes #90
---
.../qpid/server/transport/SelectorThread.java | 108 -
1 file changed, 39 insertions(+), 69 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
index 6c0ce8d..dfd7659 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
@@ -71,8 +71,6 @@ class SelectorThread extends Thread
{
private final Selector _selector;
private final AtomicBoolean _selecting = new AtomicBoolean();
-private final AtomicBoolean _inSelect = new AtomicBoolean();
-private final AtomicInteger _wakeups = new AtomicInteger();
private long _nextTimeout;
/**
@@ -102,7 +100,7 @@ class SelectorThread extends Thread
return _selecting.compareAndSet(false,true);
}
-public void clearSelecting()
+private void clearSelecting()
{
_selecting.set(false);
}
@@ -295,81 +293,57 @@ class SelectorThread extends Thread
_scheduler.incrementRunningCount();
try
{
-while (!_closed.get())
+while (!_closed.get() && acquireSelecting())
{
-if (acquireSelecting())
+final List connections = new
ArrayList<>();
+try
{
-List connections = new
ArrayList<>();
-try
+
Thread.currentThread().setName(_scheduler.getSelectorThreadName());
+_selector.select(_nextTimeout);
+
+for (final NonBlockingConnection connection :
processSelectionKeys())
{
-if (!_closed.get())
+if (connection.setScheduled())
{
-
Thread.currentThread().setName(_scheduler.getSelectorThreadName());
-_inSelect.set(true);
-try
-{
-if (_wakeups.getAndSet(0) > 0)
-{
-_selector.selectNow();
-}
-else
-{
-_selector.select(_nextTimeout);
-}
-}
-catch (IOException e)
-{
-// TODO Inform the model object
-LOGGER.error("Failed to trying to
select()", e);
-closeSelector();
-return;
-}
-finally
-{
-_inSelect.set(false);
-}
-for (NonBlockingConnection connection :
processSelectionKeys())
-{
-if (connection.setScheduled())
-{
-connections.add(new
ConnectionProcessor(_scheduler, connection));
-}
-}
-for (NonBlockingConnection connection :
reregisterUnregisteredConnections())
-{
-if (connection.setScheduled())
-{
-connections.add(new
ConnectionProcessor(_scheduler, connection));
-}
-}
-for (NonBlockingConnection connection :
processUnscheduledConnections())
-{
-
[qpid-broker-j] branch 8.0.x updated: QPID-8560: [Broker-J] Upgrade fasterxml jackson dependency to version 2.12.4
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/8.0.x by this push: new fc387b0 QPID-8560: [Broker-J] Upgrade fasterxml jackson dependency to version 2.12.4 fc387b0 is described below commit fc387b0499a43a995b03257896c5d71a5e97bd5a Author: Alex Rudyy AuthorDate: Sun Aug 22 20:58:01 2021 +0100 QPID-8560: [Broker-J] Upgrade fasterxml jackson dependency to version 2.12.4 --- .../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE| 6 +++--- .../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE| 6 +++--- pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 59f6b5b..473dff8 100644 --- a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -43,11 +43,11 @@ From: 'Apache Software Foundation' (http://db.apache.org/) License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'FasterXML' (http://fasterxml.com/) - - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.3 + - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.3 + - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.3 + - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'GlassFish Community' (https://glassfish.dev.java.net) diff --git a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 1532d60..796b582 100644 --- a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -35,11 +35,11 @@ From: 'Apache Software Foundation' (http://www.apache.org) License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'FasterXML' (http://fasterxml.com/) - - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.3 + - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.3 + - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.3 + - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'QOS.ch' (http://www.qos.ch) diff --git a/pom.xml b/pom.xml index 1d669d6..8d60c87 100644 --- a/pom.xml +++ b/pom.xml @@ -105,8 +105,8 @@ 10.14.2.0 1.2.3 30.0-jre -2.12.3 - 2.12.3 +2.12.4 + 2.12.4 1.7.30 9.4.35.v20201120 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated: QPID-8560: [Broker-J] Upgrade fasterxml jackson dependency to version 2.12.4
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/main by this push: new 3ede770 QPID-8560: [Broker-J] Upgrade fasterxml jackson dependency to version 2.12.4 3ede770 is described below commit 3ede770843a0e1aac46b76036b3c9a8d8c758a93 Author: Alex Rudyy AuthorDate: Sun Aug 22 20:58:01 2021 +0100 QPID-8560: [Broker-J] Upgrade fasterxml jackson dependency to version 2.12.4 --- .../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE| 6 +++--- .../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE| 6 +++--- pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 0bd514e..22596d9 100644 --- a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -43,11 +43,11 @@ From: 'Apache Software Foundation' (http://db.apache.org/) License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'FasterXML' (http://fasterxml.com/) - - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.3 + - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.3 + - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.3 + - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'GlassFish Community' (https://glassfish.dev.java.net) diff --git a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 1532d60..796b582 100644 --- a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -35,11 +35,11 @@ From: 'Apache Software Foundation' (http://www.apache.org) License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'FasterXML' (http://fasterxml.com/) - - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.3 + - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.3 + - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.3 + - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.4 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'QOS.ch' (http://www.qos.ch) diff --git a/pom.xml b/pom.xml index 42ed538..1eacc38 100644 --- a/pom.xml +++ b/pom.xml @@ -106,8 +106,8 @@ 10.14.2.0 1.2.3 30.0-jre -2.12.3 - 2.12.3 +2.12.4 + 2.12.4 1.7.30 9.4.35.v20201120 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated: QPID-8559: Add debug logging for flow to disk conditions
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 40cf8a6 QPID-8559: Add debug logging for flow to disk conditions
40cf8a6 is described below
commit 40cf8a6b6bb16fd9d5da55b2b1e0046b762fe022
Author: Alex Rudyy
AuthorDate: Sun Aug 22 20:18:30 2021 +0100
QPID-8559: Add debug logging for flow to disk conditions
---
.../org/apache/qpid/server/model/BrokerImpl.java | 37 ++
.../server/virtualhost/AbstractVirtualHost.java| 59 ++
.../runtime/Java-Broker-Runtime-Flow-To-Disk.xml | 50 ++
3 files changed, 146 insertions(+)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index 7d0b77f..11e3868 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -43,6 +43,7 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Pattern;
@@ -96,6 +97,7 @@ import
org.apache.qpid.server.virtualhost.VirtualHostPropertiesNodeCreator;
public class BrokerImpl extends AbstractContainer implements
Broker
{
private static final Logger LOGGER =
LoggerFactory.getLogger(BrokerImpl.class);
+private static final Logger DIRECT_MEMORY_USAGE_LOGGER =
LoggerFactory.getLogger("org.apache.qpid.server.directMemory.broker");
private static final Pattern MODEL_VERSION_PATTERN =
Pattern.compile("^\\d+\\.\\d+$");
@@ -146,6 +148,8 @@ public class BrokerImpl extends
AbstractContainer implements Broker<
private volatile ScheduledFuture _statisticsReportingFuture;
private long _housekeepingCheckPeriod;
+private final AtomicBoolean _directMemoryExceedsThresholdReported = new
AtomicBoolean();
+
@ManagedObjectFactoryConstructor
public BrokerImpl(Map attributes,
SystemConfig parent)
@@ -571,6 +575,7 @@ public class BrokerImpl extends
AbstractContainer implements Broker<
@Override
public synchronized void assignTargetSizes()
{
+reportDirectMemoryAboveThresholdIfExceeded();
LOGGER.debug("Assigning target sizes based on total target {}",
_flowToDiskThreshold);
long totalSize = 0l;
Collection> vhns = getVirtualHostNodes();
@@ -609,6 +614,7 @@ public class BrokerImpl extends
AbstractContainer implements Broker<
}
entry.getKey().setTargetSize(size);
}
+reportDirectMemoryBelowThresholdIfReached();
}
@Override
@@ -1344,4 +1350,35 @@ public class BrokerImpl extends
AbstractContainer implements Broker<
}
}
}
+
+private void reportDirectMemoryBelowThresholdIfReached()
+{
+if (DIRECT_MEMORY_USAGE_LOGGER.isDebugEnabled())
+{
+final long allocatedDirectMemorySize =
QpidByteBuffer.getAllocatedDirectMemorySize();
+if (allocatedDirectMemorySize >= _flowToDiskThreshold
+&& _directMemoryExceedsThresholdReported.compareAndSet(true,
false))
+{
+DIRECT_MEMORY_USAGE_LOGGER.debug("Direct memory threshold ({})
maintained : {}",
+ _flowToDiskThreshold,
+ allocatedDirectMemorySize);
+}
+}
+}
+
+private void reportDirectMemoryAboveThresholdIfExceeded()
+{
+if (DIRECT_MEMORY_USAGE_LOGGER.isDebugEnabled())
+{
+final long allocatedDirectMemorySize =
QpidByteBuffer.getAllocatedDirectMemorySize();
+if (allocatedDirectMemorySize > _flowToDiskThreshold
+&& _directMemoryExceedsThresholdReported.compareAndSet(false,
true))
+{
+DIRECT_MEMORY_USAGE_LOGGER.debug("Direct memory threshold ({})
exceeded : {}",
+ _flowToDiskThreshold,
+ allocatedDirectMemorySize);
+}
+}
+}
+
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 0950909..10782dd 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++
b/broker-core/src/main/ja
[qpid-broker-j] branch main updated: QPID-8559: Add debug logging for flow to disk conditions
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 94d5373 QPID-8559: Add debug logging for flow to disk conditions
94d5373 is described below
commit 94d5373a9d402827fd761e2b190fa3df435f95ed
Author: Alex Rudyy
AuthorDate: Sun Aug 22 20:18:30 2021 +0100
QPID-8559: Add debug logging for flow to disk conditions
---
.../org/apache/qpid/server/model/BrokerImpl.java | 36 +
.../server/virtualhost/AbstractVirtualHost.java| 59 ++
.../runtime/Java-Broker-Runtime-Flow-To-Disk.xml | 50 ++
3 files changed, 145 insertions(+)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index d2bd9d4..2d61b11 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -43,6 +43,7 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Pattern;
@@ -96,6 +97,7 @@ import
org.apache.qpid.server.virtualhost.VirtualHostPropertiesNodeCreator;
public class BrokerImpl extends AbstractContainer implements
Broker
{
private static final Logger LOGGER =
LoggerFactory.getLogger(BrokerImpl.class);
+private static final Logger DIRECT_MEMORY_USAGE_LOGGER =
LoggerFactory.getLogger("org.apache.qpid.server.directMemory.broker");
private static final Pattern MODEL_VERSION_PATTERN =
Pattern.compile("^\\d+\\.\\d+$");
@@ -146,6 +148,8 @@ public class BrokerImpl extends
AbstractContainer implements Broker<
private volatile ScheduledFuture _statisticsReportingFuture;
private long _housekeepingCheckPeriod;
+private final AtomicBoolean _directMemoryExceedsThresholdReported = new
AtomicBoolean();
+
@ManagedObjectFactoryConstructor
public BrokerImpl(Map attributes,
SystemConfig parent)
@@ -571,6 +575,7 @@ public class BrokerImpl extends
AbstractContainer implements Broker<
@Override
public synchronized void assignTargetSizes()
{
+reportDirectMemoryAboveThresholdIfExceeded();
LOGGER.debug("Assigning target sizes based on total target {}",
_flowToDiskThreshold);
long totalSize = 0l;
Collection> vhns = getVirtualHostNodes();
@@ -609,6 +614,7 @@ public class BrokerImpl extends
AbstractContainer implements Broker<
}
entry.getKey().setTargetSize(size);
}
+reportDirectMemoryBelowThresholdIfReached();
}
@Override
@@ -1352,4 +1358,34 @@ public class BrokerImpl extends
AbstractContainer implements Broker<
}
return
Collections.unmodifiableSet(currentSubject.getPrincipals(GroupPrincipal.class));
}
+
+private void reportDirectMemoryBelowThresholdIfReached()
+{
+if (DIRECT_MEMORY_USAGE_LOGGER.isDebugEnabled())
+{
+final long allocatedDirectMemorySize =
QpidByteBuffer.getAllocatedDirectMemorySize();
+if (allocatedDirectMemorySize >= _flowToDiskThreshold
+&& _directMemoryExceedsThresholdReported.compareAndSet(true,
false))
+{
+DIRECT_MEMORY_USAGE_LOGGER.debug("Direct memory threshold ({})
maintained : {}",
+ _flowToDiskThreshold,
+ allocatedDirectMemorySize);
+}
+}
+}
+
+private void reportDirectMemoryAboveThresholdIfExceeded()
+{
+if (DIRECT_MEMORY_USAGE_LOGGER.isDebugEnabled())
+{
+final long allocatedDirectMemorySize =
QpidByteBuffer.getAllocatedDirectMemorySize();
+if (allocatedDirectMemorySize > _flowToDiskThreshold
+&& _directMemoryExceedsThresholdReported.compareAndSet(false,
true))
+{
+DIRECT_MEMORY_USAGE_LOGGER.debug("Direct memory threshold ({})
exceeded : {}",
+ _flowToDiskThreshold,
+ allocatedDirectMemorySize);
+}
+}
+}
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index ec0d776..0b1d1de 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/Abstr
[qpid-broker-j] branch main updated: QPID-8550 - [Broker-J] Use try-resources even when streams/readers are closed in invoked API
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new f6f79d1 QPID-8550 - [Broker-J] Use try-resources even when
streams/readers are closed in invoked API
f6f79d1 is described below
commit f6f79d11fe51b1323173fb20e2f13fb06ec3eeaa
Author: dakirily
AuthorDate: Tue Jul 20 12:45:14 2021 +0200
QPID-8550 - [Broker-J] Use try-resources even when streams/readers are
closed in invoked API
This closes #103
---
.../qpid/server/store/JsonFileConfigStore.java | 17 ++---
.../java/org/apache/qpid/server/util/FileUtils.java | 12 +++-
.../virtualhostnode/AbstractVirtualHostNode.java| 21 +++--
.../config/JavaScriptConfigEvaluator.java | 9 +
.../org/apache/qpid/test/utils/TestFileUtils.java | 6 ++
.../org/apache/qpid/tests/http/HttpTestHelper.java | 7 +--
.../org/apache/qpid/tools/RestStressTestClient.java | 9 +
7 files changed, 45 insertions(+), 36 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
b/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
index f394b11..c68ca00 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
@@ -156,18 +156,21 @@ public class JsonFileConfigStore extends
AbstractJsonFileStore implements Durabl
boolean updated = false;
Collection records =
Collections.emptyList();
-ConfiguredObjectRecordConverter configuredObjectRecordConverter =
+final ConfiguredObjectRecordConverter
configuredObjectRecordConverter =
new ConfiguredObjectRecordConverter(_parent.getModel());
-records = configuredObjectRecordConverter.readFromJson(_rootClass,
_parent, new FileReader(configFile));
+try (FileReader configFileReader = new FileReader(configFile))
+{
+records =
configuredObjectRecordConverter.readFromJson(_rootClass, _parent,
configFileReader);
+}
-if(_rootClass == null)
+if (_rootClass == null)
{
_rootClass = configuredObjectRecordConverter.getRootClass();
_classNameMapping =
generateClassNameMap(configuredObjectRecordConverter.getModel(), _rootClass);
}
-if(records.isEmpty())
+if (records.isEmpty())
{
LOGGER.debug("File contains no records - using initial
configuration");
records = Arrays.asList(initialRecords);
@@ -176,9 +179,9 @@ public class JsonFileConfigStore extends
AbstractJsonFileStore implements Durabl
{
String containerTypeName = ((DynamicModel)
_parent).getDefaultContainerType();
ConfiguredObjectRecord rootRecord = null;
-for(ConfiguredObjectRecord record : records)
+for (ConfiguredObjectRecord record : records)
{
-if(record.getParents() == null ||
record.getParents().isEmpty())
+if (record.getParents() == null ||
record.getParents().isEmpty())
{
rootRecord = record;
break;
@@ -189,7 +192,7 @@ public class JsonFileConfigStore extends
AbstractJsonFileStore implements Durabl
containerTypeName =
rootRecord.getAttributes().get(ConfiguredObject.TYPE).toString();
}
-QpidServiceLoader loader = new QpidServiceLoader();
+final QpidServiceLoader loader = new QpidServiceLoader();
final ContainerType containerType =
loader.getInstancesByType(ContainerType.class).get(containerTypeName);
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/util/FileUtils.java
b/broker-core/src/main/java/org/apache/qpid/server/util/FileUtils.java
index f182339..f8124e7 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/util/FileUtils.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/util/FileUtils.java
@@ -60,7 +60,7 @@ public class FileUtils
public static byte[] readFileAsBytes(String filename)
{
-try(BufferedInputStream is = new BufferedInputStream(new
FileInputStream(filename)))
+try (BufferedInputStream is = new BufferedInputStream(new
FileInputStream(filename)))
{
return readStreamAsString(is);
}
@@ -92,7 +92,7 @@ public class FileUtils
*/
public static String readFileAsString(File file)
{
-
[qpid-broker-j] branch main updated: QPID-8553 - [Broker-J] Improve code with final keywords
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 625 QPID-8553 - [Broker-J] Improve code with final keywords
625 is described below
commit 62564fbb9231b5db5d5831540bafaafbc40f
Author: dakirily
AuthorDate: Tue Jul 20 12:55:32 2021 +0200
QPID-8553 - [Broker-J] Improve code with final keywords
This closes #104
---
.../qpid/server/logging/AbstractMessageLogger.java | 20 +++
.../org/apache/qpid/server/model/BrokerImpl.java | 62 --
.../apache/qpid/server/queue/AbstractQueue.java| 51 ++
.../server/security/CompoundAccessControl.java | 2 +-
.../access/config/RuleBasedAccessControl.java | 4 +-
.../protocol/v0_10/AMQPConnection_0_10Impl.java| 6 +--
.../server/protocol/v0_10/ServerAssembler.java | 8 +--
.../qpid/server/protocol/v0_8/AMQChannel.java | 2 +-
.../protocol/v0_8/AMQPConnection_0_8Impl.java | 2 +-
.../qpid/server/protocol/v0_8/BrokerDecoder.java | 6 +--
.../protocol/v1_0/AMQPConnection_1_0Impl.java | 10 ++--
.../logback/ConnectionAndUserPredicate.java| 10 ++--
.../logging/logback/PrincipalLogEventFilter.java | 4 +-
.../management/amqp/ManagementAddressSpace.java| 12 ++---
.../server/management/amqp/ProxyMessageSource.java | 24 -
.../plugin/servlet/rest/SaslServlet.java | 18 ---
16 files changed, 128 insertions(+), 113 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
b/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
index e511920..0e251ab 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
@@ -95,40 +95,40 @@ public abstract class AbstractMessageLogger implements
MessageLogger
abstract void rawMessage(String message, Throwable throwable, String
logHierarchy);
-protected String getActor()
+protected final String getActor()
{
return getLogActor();
}
static String getLogActor()
{
-Subject subject = Subject.getSubject(AccessController.getContext());
+final Subject subject =
Subject.getSubject(AccessController.getContext());
-SessionPrincipal sessionPrincipal = getPrincipal(subject,
SessionPrincipal.class);
+final SessionPrincipal sessionPrincipal = getPrincipal(subject,
SessionPrincipal.class);
String message;
-if(sessionPrincipal != null)
+if (sessionPrincipal != null)
{
message = generateSessionActor(sessionPrincipal.getSession());
}
else
{
-ConnectionPrincipal connPrincipal = getPrincipal(subject,
ConnectionPrincipal.class);
+final ConnectionPrincipal connPrincipal = getPrincipal(subject,
ConnectionPrincipal.class);
-if(connPrincipal != null)
+if (connPrincipal != null)
{
message =
generateConnectionActor(connPrincipal.getConnection());
}
else
{
-TaskPrincipal taskPrincipal = getPrincipal(subject,
TaskPrincipal.class);
-if(taskPrincipal != null)
+final TaskPrincipal taskPrincipal = getPrincipal(subject,
TaskPrincipal.class);
+if (taskPrincipal != null)
{
message = generateTaskMessage(taskPrincipal);
}
else
{
-ManagementConnectionPrincipal managementConnection =
getPrincipal(subject,ManagementConnectionPrincipal.class);
-if(managementConnection != null)
+final ManagementConnectionPrincipal managementConnection =
getPrincipal(subject,ManagementConnectionPrincipal.class);
+if (managementConnection != null)
{
message =
generateManagementConnectionMessage(managementConnection, getPrincipal(subject,
AuthenticatedPrincipal.class));
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index 7d0b77f..d2bd9d4 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -1021,38 +1021,13 @@ public class BrokerImpl extends
AbstractContainer implements Broker<
@Override
public SocketConnectionMetaData getConnectionMetaData()
{
-Subject subject = Subject.getSubject(AccessController.getContext());
-fi
[qpid-broker-j] branch 8.0.x updated: QPID-8547: [Broker-J] Configurable parameters for CoalescingCommiter
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 3e6ad50 QPID-8547: [Broker-J] Configurable parameters for
CoalescingCommiter
3e6ad50 is described below
commit 3e6ad50acdd8c49e034459ff1d352a88e0774cb8
Author: dakirily
AuthorDate: Fri Jul 9 13:38:48 2021 +0200
QPID-8547: [Broker-J] Configurable parameters for CoalescingCommiter
This closes #101
---
.../store/berkeleydb/CoalescingCommiter.java | 15 +++---
.../berkeleydb/StandardEnvironmentFacade.java | 18 +--
.../replication/ReplicatedEnvironmentFacade.java | 59 --
.../virtualhost/berkeleydb/BDBVirtualHost.java | 10
.../store/berkeleydb/CoalescingCommitterTest.java | 4 +-
.../src/docbkx/Java-Broker-High-Availability.xml | 5 +-
6 files changed, 96 insertions(+), 15 deletions(-)
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
index 3dceae4..a4d082d 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
@@ -40,9 +40,9 @@ public class CoalescingCommiter implements Committer
{
private final CommitThread _commitThread;
-public CoalescingCommiter(String name, EnvironmentFacade environmentFacade)
+public CoalescingCommiter(String name, int commiterNotifyThreshold, long
commiterWaitTimeout, EnvironmentFacade environmentFacade)
{
-_commitThread = new CommitThread("Commit-Thread-" + name,
environmentFacade);
+_commitThread = new CommitThread("Commit-Thread-" + name,
commiterNotifyThreshold, commiterWaitTimeout, environmentFacade);
}
@Override
@@ -134,8 +134,9 @@ public class CoalescingCommiter implements Committer
private static class CommitThread extends Thread
{
private static final Logger LOGGER =
LoggerFactory.getLogger(CommitThread.class);
-private static final int JOB_QUEUE_NOTIFY_THRESHOLD = 8;
+private final int _jobQueueNotifyThreshold;
+private final long _commiterWaitTimeout;
private final AtomicBoolean _stopped = new AtomicBoolean(false);
private final Queue _jobQueue = new
ConcurrentLinkedQueue<>();
private final Object _lock = new Object();
@@ -143,9 +144,11 @@ public class CoalescingCommiter implements Committer
private final List _inProcessJobs = new
ArrayList<>(256);
-public CommitThread(String name, EnvironmentFacade environmentFacade)
+public CommitThread(String name, int commiterNotifyThreshold, long
commiterWaitTimeout, EnvironmentFacade environmentFacade)
{
super(name);
+this._jobQueueNotifyThreshold = commiterNotifyThreshold;
+this._commiterWaitTimeout = commiterWaitTimeout;
_environmentFacade = environmentFacade;
}
@@ -170,7 +173,7 @@ public class CoalescingCommiter implements Committer
{
// Periodically wake up and check, just in case we
// missed a notification. Don't want to lock the
broker hard.
-_lock.wait(500);
+_lock.wait(_commiterWaitTimeout);
}
catch (InterruptedException e)
{
@@ -248,7 +251,7 @@ public class CoalescingCommiter implements Committer
throw new IllegalStateException("Commit thread is stopped");
}
_jobQueue.add(commit);
-if(sync || _jobQueue.size() >= JOB_QUEUE_NOTIFY_THRESHOLD)
+if(sync || _jobQueue.size() >= _jobQueueNotifyThreshold)
{
synchronized (_lock)
{
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
index 3b55d24..59070a1 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
@@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicReference;
import com.google.common.util.concurrent.ListenableFuture;
+
import com.sleepycat.je.CheckpointConfig;
import com.sleepycat.je.Database;
import com.sleepycat.je.DatabaseConfig;
@@ -45,14 +46,15 @@ import com.sleepycat.je.Sequence;
import com.sleepycat.je.SequenceConfi
[qpid-broker-j] branch main updated: QPID-8547: [Broker-J] Configurable parameters for CoalescingCommiter
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new da4f6eb QPID-8547: [Broker-J] Configurable parameters for
CoalescingCommiter
da4f6eb is described below
commit da4f6ebbdf05a51cb0117a9d50c375d42398835b
Author: dakirily
AuthorDate: Fri Jul 9 13:38:48 2021 +0200
QPID-8547: [Broker-J] Configurable parameters for CoalescingCommiter
This closes #101
---
.../store/berkeleydb/CoalescingCommiter.java | 15 +++---
.../berkeleydb/StandardEnvironmentFacade.java | 18 +--
.../replication/ReplicatedEnvironmentFacade.java | 59 --
.../virtualhost/berkeleydb/BDBVirtualHost.java | 10
.../store/berkeleydb/CoalescingCommitterTest.java | 4 +-
.../src/docbkx/Java-Broker-High-Availability.xml | 5 +-
6 files changed, 96 insertions(+), 15 deletions(-)
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
index 3dceae4..a4d082d 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
@@ -40,9 +40,9 @@ public class CoalescingCommiter implements Committer
{
private final CommitThread _commitThread;
-public CoalescingCommiter(String name, EnvironmentFacade environmentFacade)
+public CoalescingCommiter(String name, int commiterNotifyThreshold, long
commiterWaitTimeout, EnvironmentFacade environmentFacade)
{
-_commitThread = new CommitThread("Commit-Thread-" + name,
environmentFacade);
+_commitThread = new CommitThread("Commit-Thread-" + name,
commiterNotifyThreshold, commiterWaitTimeout, environmentFacade);
}
@Override
@@ -134,8 +134,9 @@ public class CoalescingCommiter implements Committer
private static class CommitThread extends Thread
{
private static final Logger LOGGER =
LoggerFactory.getLogger(CommitThread.class);
-private static final int JOB_QUEUE_NOTIFY_THRESHOLD = 8;
+private final int _jobQueueNotifyThreshold;
+private final long _commiterWaitTimeout;
private final AtomicBoolean _stopped = new AtomicBoolean(false);
private final Queue _jobQueue = new
ConcurrentLinkedQueue<>();
private final Object _lock = new Object();
@@ -143,9 +144,11 @@ public class CoalescingCommiter implements Committer
private final List _inProcessJobs = new
ArrayList<>(256);
-public CommitThread(String name, EnvironmentFacade environmentFacade)
+public CommitThread(String name, int commiterNotifyThreshold, long
commiterWaitTimeout, EnvironmentFacade environmentFacade)
{
super(name);
+this._jobQueueNotifyThreshold = commiterNotifyThreshold;
+this._commiterWaitTimeout = commiterWaitTimeout;
_environmentFacade = environmentFacade;
}
@@ -170,7 +173,7 @@ public class CoalescingCommiter implements Committer
{
// Periodically wake up and check, just in case we
// missed a notification. Don't want to lock the
broker hard.
-_lock.wait(500);
+_lock.wait(_commiterWaitTimeout);
}
catch (InterruptedException e)
{
@@ -248,7 +251,7 @@ public class CoalescingCommiter implements Committer
throw new IllegalStateException("Commit thread is stopped");
}
_jobQueue.add(commit);
-if(sync || _jobQueue.size() >= JOB_QUEUE_NOTIFY_THRESHOLD)
+if(sync || _jobQueue.size() >= _jobQueueNotifyThreshold)
{
synchronized (_lock)
{
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
index 3b55d24..59070a1 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
@@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicReference;
import com.google.common.util.concurrent.ListenableFuture;
+
import com.sleepycat.je.CheckpointConfig;
import com.sleepycat.je.Database;
import com.sleepycat.je.DatabaseConfig;
@@ -45,14 +46,15 @@ import com.sleepycat.je.Sequence;
import com.sleepycat.je.SequenceConfi
[qpid-broker-j] branch 8.0.x updated: QPID-8556:[Broker-J] Expose virtual host threshold for triggering flow to disk on direct memory utilization
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 33a741b QPID-8556:[Broker-J] Expose virtual host threshold for
triggering flow to disk on direct memory utilization
33a741b is described below
commit 33a741bac7b510ba4a3326aaca4a868eaa990e3d
Author: Alex Rudyy
AuthorDate: Sun Jul 25 18:42:58 2021 +0100
QPID-8556:[Broker-J] Expose virtual host threshold for triggering flow to
disk on direct memory utilization
---
.../org/apache/qpid/server/virtualhost/AbstractVirtualHost.java| 6 ++
.../apache/qpid/server/virtualhost/QueueManagingVirtualHost.java | 7 +++
2 files changed, 13 insertions(+)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 7a6286b..0950909 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -1484,6 +1484,12 @@ public abstract class AbstractVirtualHost> exte
}
@Override
+public long getInMemoryMessageThreshold()
+{
+return getTargetSize();
+}
+
+@Override
public > T getAttainedChildFromAddress(final
Class childClass,
final
String address)
{
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
index 2022aa4..48a9373 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
@@ -281,6 +281,13 @@ public interface QueueManagingVirtualHost>
long getInMemoryMessageSize();
@SuppressWarnings("unused")
+@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units =
StatisticUnit.BYTES,
+label = "In-Memory Message Bytes Threshold",
+description="A threshold for triggering flow to disk when the size
of all messages cached in-memory exceeds the value.",
+metricName = "in_memory_message_threshold_bytes_total")
+long getInMemoryMessageThreshold();
+
+@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units =
StatisticUnit.BYTES, label = "Evacuated Message Bytes",
description = "Total Number of Bytes Evacuated from
Memory Due to Flow to Disk.")
long getBytesEvacuatedFromMemory();
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated: QPID-8556:[Broker-J] Expose virtual host threshold for triggering flow to disk on direct memory utilization
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new df0379f QPID-8556:[Broker-J] Expose virtual host threshold for
triggering flow to disk on direct memory utilization
df0379f is described below
commit df0379f9dc61f021480e30a307f30ccde2182afd
Author: Alex Rudyy
AuthorDate: Sun Jul 25 18:42:58 2021 +0100
QPID-8556:[Broker-J] Expose virtual host threshold for triggering flow to
disk on direct memory utilization
---
.../org/apache/qpid/server/virtualhost/AbstractVirtualHost.java| 6 ++
.../apache/qpid/server/virtualhost/QueueManagingVirtualHost.java | 7 +++
2 files changed, 13 insertions(+)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index c4c0ff5..ec0d776 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -1499,6 +1499,12 @@ public abstract class AbstractVirtualHost> exte
}
@Override
+public long getInMemoryMessageThreshold()
+{
+return getTargetSize();
+}
+
+@Override
public > T getAttainedChildFromAddress(final
Class childClass,
final
String address)
{
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
index 4cd276a..690c076 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
@@ -276,6 +276,13 @@ public interface QueueManagingVirtualHost>
long getInMemoryMessageSize();
@SuppressWarnings("unused")
+@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units =
StatisticUnit.BYTES,
+label = "In-Memory Message Bytes Threshold",
+description="A threshold for triggering flow to disk when the size
of all messages cached in-memory exceeds the value.",
+metricName = "in_memory_message_threshold_bytes_total")
+long getInMemoryMessageThreshold();
+
+@SuppressWarnings("unused")
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units =
StatisticUnit.BYTES, label = "Evacuated Message Bytes",
description = "Total Number of Bytes Evacuated from
Memory Due to Flow to Disk.")
long getBytesEvacuatedFromMemory();
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8555: [Broker-J] Allow method OPTIONS in HTTP management attribute for setting CORS allowed methods
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit dc5bba197bc7327698b28500d6d1bfd546ced1df
Author: Alex Rudyy
AuthorDate: Sun Jul 25 17:06:14 2021 +0100
QPID-8555: [Broker-J] Allow method OPTIONS in HTTP management attribute for
setting CORS allowed methods
---
.../java/org/apache/qpid/server/management/plugin/HttpManagement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index dcc58f1..080b7bd 100644
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -884,7 +884,7 @@ public class HttpManagement extends
AbstractPluginAdapter implem
@SuppressWarnings("unused")
public static Set getAllAvailableCorsMethodCombinations()
{
-List methods = Arrays.asList("OPTION", "HEAD", "GET", "POST",
"PUT", "DELETE");
+List methods = Arrays.asList("OPTIONS", "HEAD", "GET", "POST",
"PUT", "DELETE");
Set> combinations = new HashSet<>();
int n = methods.size();
assert n < 31 : "Too many combination to calculate";
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated (53fa019 -> dc5bba1)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from 53fa019 QPID-8161:[Broekr-J] Rethrow LockTimeoutException on sequence
generation as ConnectionScopedRuntimeException
new 69f8aaa QPID-8552: [Broker-J] Respond with forbidden error when
request is made using unsupported method
new dc5bba1 QPID-8555: [Broker-J] Allow method OPTIONS in HTTP management
attribute for setting CORS allowed methods
The 2 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:
.../server/management/plugin/HttpManagement.java | 6 +-
.../plugin/filter/ForbiddingTraceFilter.java | 68
...compressedJavascript.java => MethodFilter.java} | 43 +-
.../management/plugin/filter/MethodFilterTest.java | 92 ++
4 files changed, 117 insertions(+), 92 deletions(-)
delete mode 100644
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingTraceFilter.java
copy
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/{RewriteRequestForUncompressedJavascript.java
=> MethodFilter.java} (57%)
create mode 100644
broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/filter/MethodFilterTest.java
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8552: [Broker-J] Respond with forbidden error when request is made using unsupported method
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 69f8aaa353bec0a57d7b4b149a9552831f35d3c7
Author: Alex Rudyy
AuthorDate: Sun Jul 25 17:04:28 2021 +0100
QPID-8552: [Broker-J] Respond with forbidden error when request is made
using unsupported method
---
.../server/management/plugin/HttpManagement.java | 4 +-
.../plugin/filter/ForbiddingTraceFilter.java | 68
.../management/plugin/filter/MethodFilter.java | 81 +++
.../management/plugin/filter/MethodFilterTest.java | 92 ++
4 files changed, 175 insertions(+), 70 deletions(-)
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 239d269..dcc58f1 100644
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -83,9 +83,9 @@ import
org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
import org.apache.qpid.server.logging.messages.PortMessages;
import
org.apache.qpid.server.management.plugin.filter.AuthenticationCheckFilter;
import org.apache.qpid.server.management.plugin.filter.ExceptionHandlingFilter;
-import org.apache.qpid.server.management.plugin.filter.ForbiddingTraceFilter;
import
org.apache.qpid.server.management.plugin.filter.InteractiveAuthenticationFilter;
import org.apache.qpid.server.management.plugin.filter.LoggingFilter;
+import org.apache.qpid.server.management.plugin.filter.MethodFilter;
import org.apache.qpid.server.management.plugin.filter.RedirectFilter;
import
org.apache.qpid.server.management.plugin.filter.RewriteRequestForUncompressedJavascript;
import org.apache.qpid.server.management.plugin.servlet.FileServlet;
@@ -348,7 +348,7 @@ public class HttpManagement extends
AbstractPluginAdapter implem
corsFilter.setInitParameter(CrossOriginFilter.ALLOW_CREDENTIALS_PARAM,
String.valueOf(getCorsAllowCredentials()));
root.addFilter(corsFilter, "/*", EnumSet.of(DispatcherType.REQUEST));
-root.addFilter(new FilterHolder(new ForbiddingTraceFilter()), "/*",
EnumSet.of(DispatcherType.REQUEST));
+root.addFilter(new FilterHolder(new MethodFilter()), "/*",
EnumSet.of(DispatcherType.REQUEST));
addFiltersAndServletsForRest(root);
if (!Boolean.TRUE.equals(getContextValue(Boolean.class,
DISABLE_UI_CONTEXT_NAME)))
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingTraceFilter.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingTraceFilter.java
deleted file mode 100644
index c35b0df..000
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingTraceFilter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management.plugin.filter;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- *
- * This {@link Filter} blocks HTTP TRACE commands from being
- * processed. All TRACE requests are sent a 403 error.
- *
- */
-public class ForbiddingTraceFilter implements Filter
-{
-private static final String METHOD_TRACE = "TRACE";
-
-@Override
-public void destroy()
-{
-}
-
-@Override
-public void init(FilterConfig config) throws ServletException
-{
-}
-
-@Override
-public void doFilter(ServletRequest request, Serv
[qpid-broker-j] 02/02: QPID-8555: [Broker-J] Allow method OPTIONS in HTTP management attribute for setting CORS allowed methods
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 3180b7ca1644abbd03f949f108d7b2001ef111b0
Author: Alex Rudyy
AuthorDate: Sun Jul 25 17:06:14 2021 +0100
QPID-8555: [Broker-J] Allow method OPTIONS in HTTP management attribute for
setting CORS allowed methods
---
.../java/org/apache/qpid/server/management/plugin/HttpManagement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 0703a1f..f87fe88 100644
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -884,7 +884,7 @@ public class HttpManagement extends
AbstractPluginAdapter implem
@SuppressWarnings("unused")
public static Set getAllAvailableCorsMethodCombinations()
{
-List methods = Arrays.asList("OPTION", "HEAD", "GET", "POST",
"PUT", "DELETE");
+List methods = Arrays.asList("OPTIONS", "HEAD", "GET", "POST",
"PUT", "DELETE");
Set> combinations = new HashSet<>();
int n = methods.size();
assert n < 31 : "Too many combination to calculate";
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8552: [Broker-J] Respond with forbidden error when request is made using unsupported method
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 8152ce7c723095b91137c4aedd8b9f8a83437d70
Author: Alex Rudyy
AuthorDate: Sun Jul 25 17:04:28 2021 +0100
QPID-8552: [Broker-J] Respond with forbidden error when request is made
using unsupported method
---
.../server/management/plugin/HttpManagement.java | 4 +-
.../plugin/filter/ForbiddingTraceFilter.java | 68
.../management/plugin/filter/MethodFilter.java | 81 +++
.../management/plugin/filter/MethodFilterTest.java | 92 ++
4 files changed, 175 insertions(+), 70 deletions(-)
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 374116e..0703a1f 100644
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -83,9 +83,9 @@ import
org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
import org.apache.qpid.server.logging.messages.PortMessages;
import
org.apache.qpid.server.management.plugin.filter.AuthenticationCheckFilter;
import org.apache.qpid.server.management.plugin.filter.ExceptionHandlingFilter;
-import org.apache.qpid.server.management.plugin.filter.ForbiddingTraceFilter;
import
org.apache.qpid.server.management.plugin.filter.InteractiveAuthenticationFilter;
import org.apache.qpid.server.management.plugin.filter.LoggingFilter;
+import org.apache.qpid.server.management.plugin.filter.MethodFilter;
import org.apache.qpid.server.management.plugin.filter.RedirectFilter;
import
org.apache.qpid.server.management.plugin.filter.RewriteRequestForUncompressedJavascript;
import org.apache.qpid.server.management.plugin.servlet.FileServlet;
@@ -348,7 +348,7 @@ public class HttpManagement extends
AbstractPluginAdapter implem
corsFilter.setInitParameter(CrossOriginFilter.ALLOW_CREDENTIALS_PARAM,
String.valueOf(getCorsAllowCredentials()));
root.addFilter(corsFilter, "/*", EnumSet.of(DispatcherType.REQUEST));
-root.addFilter(new FilterHolder(new ForbiddingTraceFilter()), "/*",
EnumSet.of(DispatcherType.REQUEST));
+root.addFilter(new FilterHolder(new MethodFilter()), "/*",
EnumSet.of(DispatcherType.REQUEST));
addFiltersAndServletsForRest(root);
if (!Boolean.TRUE.equals(getContextValue(Boolean.class,
DISABLE_UI_CONTEXT_NAME)))
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingTraceFilter.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingTraceFilter.java
deleted file mode 100644
index c35b0df..000
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingTraceFilter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management.plugin.filter;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- *
- * This {@link Filter} blocks HTTP TRACE commands from being
- * processed. All TRACE requests are sent a 403 error.
- *
- */
-public class ForbiddingTraceFilter implements Filter
-{
-private static final String METHOD_TRACE = "TRACE";
-
-@Override
-public void destroy()
-{
-}
-
-@Override
-public void init(FilterConfig config) throws ServletException
-{
-}
-
-@Override
-public void doFilter(ServletRequest request, Serv
[qpid-broker-j] branch 8.0.x updated (3b58792 -> 3180b7c)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from 3b58792 QPID-8161:[Broekr-J] Rethrow LockTimeoutException on sequence
generation as ConnectionScopedRuntimeException
new 8152ce7 QPID-8552: [Broker-J] Respond with forbidden error when
request is made using unsupported method
new 3180b7c QPID-8555: [Broker-J] Allow method OPTIONS in HTTP management
attribute for setting CORS allowed methods
The 2 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:
.../server/management/plugin/HttpManagement.java | 6 +-
.../plugin/filter/ForbiddingTraceFilter.java | 68
...compressedJavascript.java => MethodFilter.java} | 43 +-
.../management/plugin/filter/MethodFilterTest.java | 92 ++
4 files changed, 117 insertions(+), 92 deletions(-)
delete mode 100644
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingTraceFilter.java
copy
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/{RewriteRequestForUncompressedJavascript.java
=> MethodFilter.java} (57%)
create mode 100644
broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/filter/MethodFilterTest.java
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/03: QPID-8546: Cleanup tests
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit eac0ce7970d78215033d6b08241000d5deb3a437
Author: Alex Rudyy
AuthorDate: Sun Jul 18 18:30:41 2021 +0100
QPID-8546: Cleanup tests
---
.../ReplicatedEnvironmentFacadeTest.java | 263 +
1 file changed, 110 insertions(+), 153 deletions(-)
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
index 9094f02..3c0af4b 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
@@ -25,7 +25,6 @@ import static
org.apache.qpid.server.store.berkeleydb.EnvironmentFacade.LOG_HAND
import static
org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade.*;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -934,11 +933,8 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
ReplicatedEnvironmentConfiguration configuration =
createReplicatedEnvironmentConfiguration(TEST_NODE_NAME + "_1",
node1NodeHostPort, false);
when(configuration.getHelperNodeName()).thenReturn(TEST_NODE_NAME);
-TestStateChangeListener stateChangeListener = new
TestStateChangeListener();
-ReplicatedEnvironmentFacade secondNode =
createReplicatedEnvironmentFacade(TEST_NODE_NAME + "_1",
-
stateChangeListener, new NoopReplicationGroupListener(), configuration);
-assertTrue("Environment was not created",
stateChangeListener.awaitForStateChange(State.REPLICA,
-
_timeout, TimeUnit.SECONDS));
+ReplicatedEnvironmentFacade secondNode =
+createNode(configuration, TEST_NODE_NAME + "_1",
State.REPLICA);
assertEquals("Unexpected state", State.REPLICA.name(),
secondNode.getNodeState());
}
@@ -972,9 +968,7 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
@Test
public void testNodeRolledback() throws Exception
{
-DatabaseConfig createConfig = new DatabaseConfig();
-createConfig.setAllowCreate(true);
-createConfig.setTransactional(true);
+DatabaseConfig createConfig = createDatabaseConfig();
TestStateChangeListener masterListener = new TestStateChangeListener();
ReplicatedEnvironmentFacade node1 = addNode(TEST_NODE_NAME,
TEST_NODE_HOST_PORT, true, masterListener, new NoopReplicationGroupListener());
@@ -988,12 +982,12 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
Database db = node1.openDatabase("mydb", createConfig);
// Put a record (that will be replicated)
-putRecord(node1, db, 1, "value1");
+putRecord(node1, db, 1, "value1", false);
node2.close();
// Put a record (that will be only on node1 as node2 is now offline)
-putRecord(node1, db, 2, "value2");
+putRecord(node1, db, 2, "value2", false);
db.close();
@@ -1012,7 +1006,7 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
db = node2.openDatabase("mydb", DatabaseConfig.DEFAULT);
// Do a transaction on node2. The two environments will have diverged
-putRecord(node2, db, 3, "diverged");
+putRecord(node2, db, 3, "diverged", false);
LOGGER.debug("RESTARTING " + TEST_NODE_NAME);
// Now restart node1 and ensure that it realises it needs to rollback
before it can rejoin.
@@ -1033,7 +1027,7 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
_replicaRolledback.await(_timeout, TimeUnit.SECONDS));
// Finally do one more transaction through the master
-putRecord(node2, db, 4, "value4");
+putRecord(node2, db, 4, "value4", false);
db.close();
LOGGER.debug("CLOSING");
@@ -1199,176 +1193,149 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
}
@Test
-public void testNodeCommitNoSyncWithCoalescing() throws Exception
+p
[qpid-broker-j] 03/03: QPID-8161:[Broekr-J] Rethrow LockTimeoutException on sequence generation as ConnectionScopedRuntimeException
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 3b58792032bea988f186e3db119951d095046bc9
Author: Dedeepya T
AuthorDate: Fri Jul 16 16:07:31 2021 +0530
QPID-8161:[Broekr-J] Rethrow LockTimeoutException on sequence generation as
ConnectionScopedRuntimeException
This closes #102
---
.../store/berkeleydb/AbstractBDBMessageStore.java | 6
.../store/berkeleydb/BDBMessageStoreTest.java | 33 ++
2 files changed, 39 insertions(+)
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 84e1190..a7df6a7 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -41,6 +41,7 @@ import com.sleepycat.je.DatabaseEntry;
import com.sleepycat.je.DatabaseNotFoundException;
import com.sleepycat.je.LockConflictException;
import com.sleepycat.je.LockMode;
+import com.sleepycat.je.LockTimeoutException;
import com.sleepycat.je.OperationStatus;
import com.sleepycat.je.Sequence;
import com.sleepycat.je.SequenceConfig;
@@ -72,6 +73,7 @@ import org.apache.qpid.server.store.handler.MessageHandler;
import org.apache.qpid.server.store.handler.MessageInstanceHandler;
import org.apache.qpid.server.txn.Xid;
import org.apache.qpid.server.util.CachingUUIDFactory;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
public abstract class AbstractBDBMessageStore implements MessageStore
@@ -231,6 +233,10 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
MESSAGE_METADATA_SEQ_CONFIG);
newMessageId = mmdSeq.get(null, 1);
}
+catch(LockTimeoutException le)
+{
+ throw new ConnectionScopedRuntimeException("Unexpected exception on
BDB sequence", le);
+}
catch (RuntimeException de)
{
throw getEnvironmentFacade().handleDatabaseException("Cannot get
sequence value for new message", de);
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
index 8b03750..30c288e 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
@@ -22,19 +22,30 @@ package org.apache.qpid.server.store.berkeleydb;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import java.io.File;
import java.util.Collections;
+import com.sleepycat.je.LockTimeoutException;
+import com.sleepycat.je.Sequence;
import org.junit.Test;
+import org.mockito.Mockito;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.message.internal.InternalMessageMetaData;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.protocol.v0_8.AMQShortString;
import org.apache.qpid.server.protocol.v0_8.FieldTableFactory;
@@ -47,6 +58,7 @@ import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreTestCase;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.StoredMessage;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.FileUtils;
import org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost;
import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
@@ -218,4 +230,25 @@ public class BDBMessageStoreTest extends
MessageStoreTestCase
return true;
}
+@Test
+public void testGetNextMessgaeIdWithLockException(){
+EnvironmentFacadeFactory eff = mock(EnvironmentFacadeFactory.class);
+EnvironmentFacade ef = mock(EnvironmentFacade.class);
+
doThrow(LockTimeoutException.class).when(ef).openSequence(any(),any(),any());
+when(((EnvironmentFacadeFactory)
eff).createEnvironmentFacade(a
[qpid-broker-j] branch 8.0.x updated (78e52b7 -> 3b58792)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from 78e52b7 QPID-8452: Fix validation of maximum message size new e92ad84 QPID-8546:[Broker-J] Use special durability for non-sync commits in BDB HA new eac0ce7 QPID-8546: Cleanup tests new 3b58792 QPID-8161:[Broekr-J] Rethrow LockTimeoutException on sequence generation as ConnectionScopedRuntimeException The 3 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: .../store/berkeleydb/AbstractBDBMessageStore.java | 23 +-- .../server/store/berkeleydb/EnvironmentFacade.java | 4 +- .../berkeleydb/StandardEnvironmentFacade.java | 13 +- .../replication/ReplicatedEnvironmentFacade.java | 56 +-- .../store/berkeleydb/BDBMessageStoreTest.java | 35 - .../ReplicatedEnvironmentFacadeTest.java | 175 ++--- 6 files changed, 253 insertions(+), 53 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/03: QPID-8546:[Broker-J] Use special durability for non-sync commits in BDB HA
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit e92ad84df4eb89e842a3a6b2f6dc91d3ddfd6a64
Author: Dedeepya T
AuthorDate: Thu Jul 15 17:01:57 2021 +0530
QPID-8546:[Broker-J] Use special durability for non-sync commits in BDB HA
This closes #99
---
.../store/berkeleydb/AbstractBDBMessageStore.java | 17 +-
.../server/store/berkeleydb/EnvironmentFacade.java | 4 +-
.../berkeleydb/StandardEnvironmentFacade.java | 13 +-
.../replication/ReplicatedEnvironmentFacade.java | 56 +--
.../store/berkeleydb/BDBMessageStoreTest.java | 2 +-
.../ReplicatedEnvironmentFacadeTest.java | 182 -
6 files changed, 239 insertions(+), 35 deletions(-)
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 94d6fb1..84e1190 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -315,7 +315,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
}
}
-void removeMessage(long messageId, boolean sync) throws StoreException
+void removeMessage(long messageId) throws StoreException
{
boolean complete = false;
Transaction tx = null;
@@ -351,7 +351,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
getLogger().debug("Deleted content for message {}",
messageId);
-getEnvironmentFacade().commit(tx, sync);
+getEnvironmentFacade().commitNoSync(tx);
complete = true;
tx = null;
@@ -789,17 +789,16 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
*
* @throws org.apache.qpid.server.store.StoreException If the operation
fails for any reason.
*/
-private void commitTranImpl(final Transaction tx, boolean syncCommit)
throws StoreException
+private void commitTranImpl(final Transaction tx) throws StoreException
{
if (tx == null)
{
throw new StoreException("Fatal internal error: transactional is
null at commitTran");
}
-getEnvironmentFacade().commit(tx, syncCommit);
+getEnvironmentFacade().commit(tx);
-getLogger().debug("commitTranImpl completed {} transaction {}",
- syncCommit ? "synchronous" : "asynchronous", tx);
+getLogger().debug("commitTranImpl completed {} transaction
synchronous", tx);
}
@@ -1201,7 +1200,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
throw
getEnvironmentFacade().handleDatabaseException("failed to begin transaction",
e);
}
store(txn);
-getEnvironmentFacade().commit(txn, false);
+getEnvironmentFacade().commitAsync(txn, false);
}
}
@@ -1214,7 +1213,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
_messages.remove(this);
if(stored())
{
-removeMessage(_messageId, false);
+removeMessage(_messageId);
storedSizeChangeOccurred(-getContentSize());
}
if (!_messageDeleteListeners.isEmpty())
@@ -1378,7 +1377,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
{
checkMessageStoreOpen();
doPreCommitActions();
-AbstractBDBMessageStore.this.commitTranImpl(_txn, true);
+AbstractBDBMessageStore.this.commitTranImpl(_txn);
doPostCommitActions();
AbstractBDBMessageStore.this.storedSizeChangeOccurred(_storeSizeIncrease);
}
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
index fcf6d78..bf5e9b7 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
@@ -67,7 +67,7 @@ public interface EnvironmentFacade
Transaction beginTransaction(TransactionConfig transactionConfig);
-void commit(Transaction tx, boolean sync);
+void commit(Transaction tx);
ListenableFuture commitAsync(Transaction tx, X val);
RuntimeException handleDatabaseException(String contextMessage,
RuntimeException e);
@@ -98,4 +98,
[qpid-broker-j] branch main updated: QPID-8161:[Broekr-J] Rethrow LockTimeoutException on sequence generation as ConnectionScopedRuntimeException
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 53fa019 QPID-8161:[Broekr-J] Rethrow LockTimeoutException on sequence
generation as ConnectionScopedRuntimeException
53fa019 is described below
commit 53fa0199f4b3d7a688711f65e0cb875e7c1afcae
Author: Dedeepya T
AuthorDate: Fri Jul 16 16:07:31 2021 +0530
QPID-8161:[Broekr-J] Rethrow LockTimeoutException on sequence generation as
ConnectionScopedRuntimeException
This closes #102
---
.../store/berkeleydb/AbstractBDBMessageStore.java | 6
.../store/berkeleydb/BDBMessageStoreTest.java | 33 ++
2 files changed, 39 insertions(+)
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 84e1190..a7df6a7 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -41,6 +41,7 @@ import com.sleepycat.je.DatabaseEntry;
import com.sleepycat.je.DatabaseNotFoundException;
import com.sleepycat.je.LockConflictException;
import com.sleepycat.je.LockMode;
+import com.sleepycat.je.LockTimeoutException;
import com.sleepycat.je.OperationStatus;
import com.sleepycat.je.Sequence;
import com.sleepycat.je.SequenceConfig;
@@ -72,6 +73,7 @@ import org.apache.qpid.server.store.handler.MessageHandler;
import org.apache.qpid.server.store.handler.MessageInstanceHandler;
import org.apache.qpid.server.txn.Xid;
import org.apache.qpid.server.util.CachingUUIDFactory;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
public abstract class AbstractBDBMessageStore implements MessageStore
@@ -231,6 +233,10 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
MESSAGE_METADATA_SEQ_CONFIG);
newMessageId = mmdSeq.get(null, 1);
}
+catch(LockTimeoutException le)
+{
+ throw new ConnectionScopedRuntimeException("Unexpected exception on
BDB sequence", le);
+}
catch (RuntimeException de)
{
throw getEnvironmentFacade().handleDatabaseException("Cannot get
sequence value for new message", de);
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
index 8b03750..30c288e 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
@@ -22,19 +22,30 @@ package org.apache.qpid.server.store.berkeleydb;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import java.io.File;
import java.util.Collections;
+import com.sleepycat.je.LockTimeoutException;
+import com.sleepycat.je.Sequence;
import org.junit.Test;
+import org.mockito.Mockito;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.message.internal.InternalMessageMetaData;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.protocol.v0_8.AMQShortString;
import org.apache.qpid.server.protocol.v0_8.FieldTableFactory;
@@ -47,6 +58,7 @@ import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreTestCase;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.StoredMessage;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.FileUtils;
import org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost;
import org.apache.qpid.test.utils.VirtualHostNodeStoreType;
@@ -218,4 +230,25 @@ public class BDBMessageStoreTest extends
MessageStoreTestCase
return true;
}
+@Test
+public void testGetNextMessgaeIdWithLockException(){
+EnvironmentFacadeFactory eff = mock(Environmen
[qpid-broker-j] 02/02: QPID-8549: Follow-up changes
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit acbc5df03c92cfe6577840e5effb389d498a46c2
Author: Alex Rudyy
AuthorDate: Sun Jul 18 19:06:43 2021 +0100
QPID-8549: Follow-up changes
---
.../main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java | 4 ++--
.../org/apache/qpid/server/transport/MultiVersionProtocolEngine.java | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
b/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
index a41a265..cca4754 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.queue;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.queue.SortedQueueEntry.Colour;
import org.apache.qpid.server.store.MessageEnqueueRecord;
-import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
/**
* A sorted implementation of QueueEntryList.
@@ -109,7 +109,7 @@ public class SortedQueueEntryList extends
AbstractQueueEntryList
}
if (parent == null)
{
-throw new ConnectionScopedRuntimeException("Failed to insert
an entry, parent not found");
+throw new ServerScopedRuntimeException("Failed to insert an
entry, parent not found");
}
entry.setParent(parent);
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
index 85e79fb..d3ddbe2 100755
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
@@ -28,7 +28,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
-import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@@ -65,7 +64,7 @@ public class MultiVersionProtocolEngine implements
ProtocolEngine
private final ProtocolEngineCreator[] _creators;
private final Runnable _onCloseTask;
-private Set _supported;
+private final Set _supported;
private String _fqdn;
private final Broker _broker;
private ServerNetworkConnection _network;
@@ -474,7 +473,7 @@ public class MultiVersionProtocolEngine implements
ProtocolEngine
{
ProtocolEngineCreator protocol =
Arrays.stream(_creators)
.filter(creator ->
creator.getVersion().isAMQP() && _supported.contains(creator.getVersion()))
-.max((creator1, creator2) ->
creator1.getVersion().ordinal() - creator2.getVersion().ordinal())
+.max(Comparator.comparingInt(creator ->
creator.getVersion().ordinal()))
.orElseThrow(() -> new
ServerScopedRuntimeException("All AMQP protocols are disabled"));
supportedReplyBytes = protocol.getHeaderIdentifier();
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8549: [Broker-J] Improve null checks
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit ac73917a37698f12335b18289a6306574f80e5a8
Author: dakirily
AuthorDate: Thu Jul 8 15:51:16 2021 +0200
QPID-8549: [Broker-J] Improve null checks
This closes #100
---
.../berkeleydb/BDBConfiguredObjectRecord.java | 5 +-
.../server/consumer/AbstractConsumerTarget.java| 6 +-
.../queue/DefinedGroupMessageGroupManager.java | 22 ++--
.../qpid/server/queue/SortedQueueEntryList.java| 15 ++-
.../transport/MultiVersionProtocolEngine.java | 46 ---
.../protocol/v1_0/AMQPConnection_1_0Impl.java | 10 +-
.../server/protocol/v1_0/ConsumerTarget_1_0.java | 142 +++--
.../protocol/v1_0/MessageConverter_from_1_0.java | 22 ++--
.../org/apache/qpid/tools/StressTestClient.java| 6 +-
.../apache/qpid/tools/util/ArgumentsParser.java| 6 +-
10 files changed, 158 insertions(+), 122 deletions(-)
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfiguredObjectRecord.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfiguredObjectRecord.java
index 3a6a9f0..715823d 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfiguredObjectRecord.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfiguredObjectRecord.java
@@ -111,7 +111,10 @@ public class BDBConfiguredObjectRecord implements
ConfiguredObjectRecord
@Override
public String toString()
{
-return "BDBConfiguredObjectRecord [id=" + _id + ", type=" + _type + ",
name=" + (_attributes == null ? null : _attributes.get("name")) + ", parents="
+ _parents + "]";
+return String.format(
+"BDBConfiguredObjectRecord [id=%s, type=%s, name=%s,
parents=%s]",
+_id, _type, (_attributes == null ? "null" :
_attributes.get("name")), _parents
+);
}
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
b/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
index 13d5e15..6733ed4 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
@@ -256,9 +256,9 @@ public abstract class AbstractConsumerTarget
}
}
-if (messageContainer != null)
+if (consumer != null && messageContainer != null)
{
-MessageInstance entry = messageContainer.getMessageInstance();
+final MessageInstance entry =
messageContainer.getMessageInstance();
try
{
send(consumer, entry, false);
@@ -281,7 +281,7 @@ public abstract class AbstractConsumerTarget
case ROUTE_TO_ALTERNATE:
if (consumer.acquires())
{
-int enqueues = entry.routeToAlternate(null,
null, null);
+final int enqueues =
entry.routeToAlternate(null, null, null);
if (enqueues == 0)
{
LOGGER.info("Failed to convert message {}
for this consumer because '{}'."
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
b/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
index 06803a7..04bb11a 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
@@ -251,14 +251,20 @@ public class DefinedGroupMessageGroupManager implements
MessageGroupManager
private Object getKey(QueueEntry entry)
{
-ServerMessage message = entry.getMessage();
-AMQMessageHeader messageHeader = message == null ? null :
message.getMessageHeader();
-Object groupVal = messageHeader == null
-? _defaultGroup
-: _groupId == null
-? messageHeader.getGroupId()
-: messageHeader.getHeader(_groupId);
-if(groupVal == null)
+final ServerMessage message = entry.getMessage();
+final AMQMessageHeader messageHeader = message == null ? null :
message.getMessageHeader();
+Object groupVal;
+if (messageHeader == null)
+{
+groupVal = _defaultGroup;
+}
+else
+{
+groupVal = _groupId == null
+? messageHeader.get
[qpid-broker-j] branch main updated (e9c78dd -> acbc5df)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from e9c78dd QPID-8546: Cleanup tests new ac73917 QPID-8549: [Broker-J] Improve null checks new acbc5df QPID-8549: Follow-up changes The 2 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: .../berkeleydb/BDBConfiguredObjectRecord.java | 5 +- .../server/consumer/AbstractConsumerTarget.java| 6 +- .../queue/DefinedGroupMessageGroupManager.java | 22 ++-- .../qpid/server/queue/SortedQueueEntryList.java| 15 ++- .../transport/MultiVersionProtocolEngine.java | 47 --- .../protocol/v1_0/AMQPConnection_1_0Impl.java | 10 +- .../server/protocol/v1_0/ConsumerTarget_1_0.java | 142 +++-- .../protocol/v1_0/MessageConverter_from_1_0.java | 22 ++-- .../org/apache/qpid/tools/StressTestClient.java| 6 +- .../apache/qpid/tools/util/ArgumentsParser.java| 6 +- 10 files changed, 158 insertions(+), 123 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/03: QPID-8545: [Broker-J] SSL Engine looping circuit breaker
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 1e52b292861cf163e67741f92da2b4497b5fe3aa
Author: dakirily
AuthorDate: Fri Jun 25 12:08:22 2021 +0200
QPID-8545: [Broker-J] SSL Engine looping circuit breaker
This closes #98
---
.../apache/qpid/server/model/port/AmqpPort.java| 16 ++
.../server/transport/NonBlockingConnection.java| 1 +
.../NonBlockingConnectionTLSDelegate.java | 36 --
.../server/transport/TCPandSSLTransportTest.java | 3 ++
4 files changed, 54 insertions(+), 2 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
index 6bfcc38..7fcb110 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
@@ -56,6 +56,10 @@ public interface AmqpPort> extends
Port
String PORT_AMQP_NUMBER_OF_SELECTORS =
"qpid.port.amqp.threadPool.numberOfSelectors";
String PORT_AMQP_ACCEPT_BACKLOG = "qpid.port.amqp.acceptBacklog";
+String PORT_DIAGNOSIS_OF_SSL_ENGINE_LOOPING =
"qpid.port.amqp.diagnosisOfSslEngineLooping";
+String PORT_DIAGNOSIS_OF_SSL_ENGINE_LOOPING_WARN_THRESHOLD =
"qpid.port.amqp.diagnosisOfSslEngineLoopingWarnThreshold";
+String PORT_DIAGNOSIS_OF_SSL_ENGINE_LOOPING_BREAK_THRESHOLD =
"qpid.port.amqp.diagnosisOfSslEngineLoopingBreakThreshold";
+
@ManagedContextDefault(name = DEFAULT_AMQP_PROTOCOLS)
String INSTALLED_PROTOCOLS = AmqpPortImpl.getInstalledProtocolsAsString();
@@ -64,6 +68,18 @@ public interface AmqpPort> extends
Port
@ManagedContextDefault(name = PORT_MAX_OPEN_CONNECTIONS)
int DEFAULT_MAX_OPEN_CONNECTIONS = -1;
+@SuppressWarnings("unused")
+@ManagedContextDefault( name = PORT_DIAGNOSIS_OF_SSL_ENGINE_LOOPING)
+boolean DEFAULT_PORT_DIAGNOSIS_OF_SSL_ENGINE_LOOPING = false;
+
+@SuppressWarnings("unused")
+@ManagedContextDefault( name =
PORT_DIAGNOSIS_OF_SSL_ENGINE_LOOPING_WARN_THRESHOLD)
+long DEFAULT_PORT_DIAGNOSIS_OF_SSL_ENGINE_LOOPING_WARN_THRESHOLD = 1000;
+
+@SuppressWarnings("unused")
+@ManagedContextDefault( name =
PORT_DIAGNOSIS_OF_SSL_ENGINE_LOOPING_BREAK_THRESHOLD)
+long DEFAULT_PORT_DIAGNOSIS_OF_SSL_ENGINE_LOOPING_BREAK_THRESHOLD = 1005;
+
String PORT_IGNORE_INVALID_SNI = "qpid.port.amqp.ignoreInvalidSni";
@SuppressWarnings("unused")
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
index 843e3d7..1bc1943 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
@@ -691,4 +691,5 @@ public class NonBlockingConnection implements
ServerNetworkConnection, ByteBuffe
{
return _selectedHost;
}
+
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
index 869775e..9255216 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.net.ssl.SNIHostName;
import javax.net.ssl.SSLEngine;
@@ -63,7 +64,10 @@ public class NonBlockingConnectionTLSDelegate implements
NonBlockingConnectionDe
private QpidByteBuffer _netOutputBuffer;
private QpidByteBuffer _applicationBuffer;
private final boolean _ignoreInvalidSni;
-
+private final AtomicInteger _loopingCounter = new AtomicInteger(0);
+private final boolean _enableDiagnosisOfSslEngineLooping;
+private final long _diagnosisOfSslEngineLoopingWarnThreshold;
+private final long _diagnosisOfSslEngineLoopingBreakThreshold;
public NonBlockingConnectionTLSDelegate(NonBlockingConnection parent,
AmqpPort port)
{
@@ -82,6 +86,9 @@ public class NonBlockingConnectionTLSDelegate implements
NonBlockingConnectionDe
_applicationBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
_netOutputBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
_ignoreInvalidSni = port.isIgnoreInvalidSni();
+_enableDiagnos
[qpid-broker-j] branch main updated (e743a7a -> e9c78dd)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from e743a7a NO-JIRA: Update dependecy references new 1e52b29 QPID-8545: [Broker-J] SSL Engine looping circuit breaker new f610c49 QPID-8546:[Broker-J] Use special durability for non-sync commits in BDB HA new e9c78dd QPID-8546: Cleanup tests The 3 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: .../store/berkeleydb/AbstractBDBMessageStore.java | 17 +- .../server/store/berkeleydb/EnvironmentFacade.java | 4 +- .../berkeleydb/StandardEnvironmentFacade.java | 13 +- .../replication/ReplicatedEnvironmentFacade.java | 56 +-- .../store/berkeleydb/BDBMessageStoreTest.java | 2 +- .../ReplicatedEnvironmentFacadeTest.java | 175 ++--- .../apache/qpid/server/model/port/AmqpPort.java| 16 ++ .../server/transport/NonBlockingConnection.java| 1 + .../NonBlockingConnectionTLSDelegate.java | 36 - .../server/transport/TCPandSSLTransportTest.java | 3 + 10 files changed, 268 insertions(+), 55 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/03: QPID-8546:[Broker-J] Use special durability for non-sync commits in BDB HA
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit f610c49fb72d789fd2647cacdac2d4619354d278
Author: Dedeepya T
AuthorDate: Thu Jul 15 17:01:57 2021 +0530
QPID-8546:[Broker-J] Use special durability for non-sync commits in BDB HA
This closes #99
---
.../store/berkeleydb/AbstractBDBMessageStore.java | 17 +-
.../server/store/berkeleydb/EnvironmentFacade.java | 4 +-
.../berkeleydb/StandardEnvironmentFacade.java | 13 +-
.../replication/ReplicatedEnvironmentFacade.java | 56 +--
.../store/berkeleydb/BDBMessageStoreTest.java | 2 +-
.../ReplicatedEnvironmentFacadeTest.java | 182 -
6 files changed, 239 insertions(+), 35 deletions(-)
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 94d6fb1..84e1190 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -315,7 +315,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
}
}
-void removeMessage(long messageId, boolean sync) throws StoreException
+void removeMessage(long messageId) throws StoreException
{
boolean complete = false;
Transaction tx = null;
@@ -351,7 +351,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
getLogger().debug("Deleted content for message {}",
messageId);
-getEnvironmentFacade().commit(tx, sync);
+getEnvironmentFacade().commitNoSync(tx);
complete = true;
tx = null;
@@ -789,17 +789,16 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
*
* @throws org.apache.qpid.server.store.StoreException If the operation
fails for any reason.
*/
-private void commitTranImpl(final Transaction tx, boolean syncCommit)
throws StoreException
+private void commitTranImpl(final Transaction tx) throws StoreException
{
if (tx == null)
{
throw new StoreException("Fatal internal error: transactional is
null at commitTran");
}
-getEnvironmentFacade().commit(tx, syncCommit);
+getEnvironmentFacade().commit(tx);
-getLogger().debug("commitTranImpl completed {} transaction {}",
- syncCommit ? "synchronous" : "asynchronous", tx);
+getLogger().debug("commitTranImpl completed {} transaction
synchronous", tx);
}
@@ -1201,7 +1200,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
throw
getEnvironmentFacade().handleDatabaseException("failed to begin transaction",
e);
}
store(txn);
-getEnvironmentFacade().commit(txn, false);
+getEnvironmentFacade().commitAsync(txn, false);
}
}
@@ -1214,7 +1213,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
_messages.remove(this);
if(stored())
{
-removeMessage(_messageId, false);
+removeMessage(_messageId);
storedSizeChangeOccurred(-getContentSize());
}
if (!_messageDeleteListeners.isEmpty())
@@ -1378,7 +1377,7 @@ public abstract class AbstractBDBMessageStore implements
MessageStore
{
checkMessageStoreOpen();
doPreCommitActions();
-AbstractBDBMessageStore.this.commitTranImpl(_txn, true);
+AbstractBDBMessageStore.this.commitTranImpl(_txn);
doPostCommitActions();
AbstractBDBMessageStore.this.storedSizeChangeOccurred(_storeSizeIncrease);
}
diff --git
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
index fcf6d78..bf5e9b7 100644
---
a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
+++
b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
@@ -67,7 +67,7 @@ public interface EnvironmentFacade
Transaction beginTransaction(TransactionConfig transactionConfig);
-void commit(Transaction tx, boolean sync);
+void commit(Transaction tx);
ListenableFuture commitAsync(Transaction tx, X val);
RuntimeException handleDatabaseException(String contextMessage,
RuntimeException e);
@@ -98,4 +98,6 @@ pu
[qpid-broker-j] 03/03: QPID-8546: Cleanup tests
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit e9c78dd43215f3ecfaa492adcce5fb0ff7fb8081
Author: Alex Rudyy
AuthorDate: Sun Jul 18 18:30:41 2021 +0100
QPID-8546: Cleanup tests
---
.../ReplicatedEnvironmentFacadeTest.java | 263 +
1 file changed, 110 insertions(+), 153 deletions(-)
diff --git
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
index 9094f02..3c0af4b 100644
---
a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
+++
b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
@@ -25,7 +25,6 @@ import static
org.apache.qpid.server.store.berkeleydb.EnvironmentFacade.LOG_HAND
import static
org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade.*;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -934,11 +933,8 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
ReplicatedEnvironmentConfiguration configuration =
createReplicatedEnvironmentConfiguration(TEST_NODE_NAME + "_1",
node1NodeHostPort, false);
when(configuration.getHelperNodeName()).thenReturn(TEST_NODE_NAME);
-TestStateChangeListener stateChangeListener = new
TestStateChangeListener();
-ReplicatedEnvironmentFacade secondNode =
createReplicatedEnvironmentFacade(TEST_NODE_NAME + "_1",
-
stateChangeListener, new NoopReplicationGroupListener(), configuration);
-assertTrue("Environment was not created",
stateChangeListener.awaitForStateChange(State.REPLICA,
-
_timeout, TimeUnit.SECONDS));
+ReplicatedEnvironmentFacade secondNode =
+createNode(configuration, TEST_NODE_NAME + "_1",
State.REPLICA);
assertEquals("Unexpected state", State.REPLICA.name(),
secondNode.getNodeState());
}
@@ -972,9 +968,7 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
@Test
public void testNodeRolledback() throws Exception
{
-DatabaseConfig createConfig = new DatabaseConfig();
-createConfig.setAllowCreate(true);
-createConfig.setTransactional(true);
+DatabaseConfig createConfig = createDatabaseConfig();
TestStateChangeListener masterListener = new TestStateChangeListener();
ReplicatedEnvironmentFacade node1 = addNode(TEST_NODE_NAME,
TEST_NODE_HOST_PORT, true, masterListener, new NoopReplicationGroupListener());
@@ -988,12 +982,12 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
Database db = node1.openDatabase("mydb", createConfig);
// Put a record (that will be replicated)
-putRecord(node1, db, 1, "value1");
+putRecord(node1, db, 1, "value1", false);
node2.close();
// Put a record (that will be only on node1 as node2 is now offline)
-putRecord(node1, db, 2, "value2");
+putRecord(node1, db, 2, "value2", false);
db.close();
@@ -1012,7 +1006,7 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
db = node2.openDatabase("mydb", DatabaseConfig.DEFAULT);
// Do a transaction on node2. The two environments will have diverged
-putRecord(node2, db, 3, "diverged");
+putRecord(node2, db, 3, "diverged", false);
LOGGER.debug("RESTARTING " + TEST_NODE_NAME);
// Now restart node1 and ensure that it realises it needs to rollback
before it can rejoin.
@@ -1033,7 +1027,7 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
_replicaRolledback.await(_timeout, TimeUnit.SECONDS));
// Finally do one more transaction through the master
-putRecord(node2, db, 4, "value4");
+putRecord(node2, db, 4, "value4", false);
db.close();
LOGGER.debug("CLOSING");
@@ -1199,176 +1193,149 @@ public class ReplicatedEnvironmentFacadeTest extends
UnitTestBase
}
@Test
-public void testNodeCommitNoSyncWithCoalescing() throws Exception
+public void testCommitNoSyncWithCoalescing
[qpid-broker-j] branch main updated: NO-JIRA: Update dependecy references
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/main by this push: new e743a7a NO-JIRA: Update dependecy references e743a7a is described below commit e743a7ad63c5a24af751eae8ffd923a647056d08 Author: Alex Rudyy AuthorDate: Tue Jun 29 22:31:14 2021 +0100 NO-JIRA: Update dependecy references --- .../limits/plugins/ConnectionLimitRuleImpl.java| 18 ++ 1 file changed, 18 insertions(+) diff --git a/broker-plugins/connection-limits/src/main/java/org/apache/qpid/server/user/connection/limits/plugins/ConnectionLimitRuleImpl.java b/broker-plugins/connection-limits/src/main/java/org/apache/qpid/server/user/connection/limits/plugins/ConnectionLimitRuleImpl.java index 3a3ec59..719118f 100644 --- a/broker-plugins/connection-limits/src/main/java/org/apache/qpid/server/user/connection/limits/plugins/ConnectionLimitRuleImpl.java +++ b/broker-plugins/connection-limits/src/main/java/org/apache/qpid/server/user/connection/limits/plugins/ConnectionLimitRuleImpl.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.qpid.server.user.connection.limits.plugins; import java.time.Duration; - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated: NO-JIRA: Update dependecy references
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/main by this push: new 74e4e79 NO-JIRA: Update dependecy references 74e4e79 is described below commit 74e4e79399704ca4b085056365a497723a73f1fb Author: Alex Rudyy AuthorDate: Tue Jun 29 22:31:14 2021 +0100 NO-JIRA: Update dependecy references --- .../src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 137a264..0bd514e 100644 --- a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -85,8 +85,6 @@ From: 'The Apache Software Foundation' (https://www.apache.org/) License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - Apache Qpid Broker-J Access Control Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-access-control) org.apache.qpid:qpid-broker-plugins-access-control:jar License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - - Apache Qpid Broker-J Connection Limits Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-connection-limits) org.apache.qpid:qpid-broker-plugins-connection-limits:jar -License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - Apache Qpid Broker-J AMQP 0-10 Protocol Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-amqp-0-10-protocol) org.apache.qpid:qpid-broker-plugins-amqp-0-10-protocol:jar License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - Apache Qpid Broker-J AMQP 0-8 Protocol Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-amqp-0-8-protocol) org.apache.qpid:qpid-broker-plugins-amqp-0-8-protocol:jar @@ -103,6 +101,8 @@ From: 'The Apache Software Foundation' (https://www.apache.org/) License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - Apache Qpid Broker-J AMQP 0-8 to 1-0 Message Conversion Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0) org.apache.qpid:qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0:jar License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) + - Apache Qpid Broker-J Connection Limit Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-connection-limits) org.apache.qpid:qpid-broker-plugins-connection-limits:jar +License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - Apache Qpid Broker-J Derby Message Store Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-derby-store) org.apache.qpid:qpid-broker-plugins-derby-store:jar License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) - Apache Qpid Broker-J LogBack JDBC Logging Plug-in (http://qpid.apache.org/components/broker-plugins/qpid-broker-plugins-jdbc-logging-logback) org.apache.qpid:qpid-broker-plugins-jdbc-logging-logback:jar - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated: QPID-8536: [Broker-J] Incorrect check of maximum open connections
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 53a99be QPID-8536: [Broker-J] Incorrect check of maximum open
connections
53a99be is described below
commit 53a99be667f06dfbe2d3a843c538fbe918375392
Author: Marek Laca
AuthorDate: Tue Jun 15 10:33:25 2021 +0200
QPID-8536: [Broker-J] Incorrect check of maximum open connections
This closes #93
---
.../apache/qpid/server/model/port/AmqpPort.java| 8 +--
.../qpid/server/model/port/AmqpPortImpl.java | 72 ++
.../MultiVersionProtocolEngineFactory.java | 3 +-
.../qpid/server/model/port/AmqpPortImplTest.java | 17 +++--
.../server/transport/TCPandSSLTransportTest.java | 2 +-
5 files changed, 46 insertions(+), 56 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
index c2b2e3d..6bfcc38 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
@@ -172,7 +172,7 @@ public interface AmqpPort> extends
Port
label = "Open Connections",
description = "Current number of connections made through this
port",
metricName = "open_connections_total")
-int getConnectionCount();
+long getConnectionCount();
@ManagedStatistic(statisticType = StatisticType.CUMULATIVE, units =
StatisticUnit.COUNT,
label = "Total Connections",
@@ -204,11 +204,9 @@ public interface AmqpPort> extends
Port
+ " 0 disables.")
int getHeartbeatDelay();
-boolean canAcceptNewConnection(final SocketAddress remoteSocketAddress);
+boolean acceptNewConnectionAndIncrementCount(final SocketAddress
remoteSocketAddress);
-int incrementConnectionCount();
-
-int decrementConnectionCount();
+long decrementConnectionCount();
int getNetworkBufferSize();
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
index a3b8156..f59e280 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
@@ -32,7 +32,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import javax.net.ssl.SSLContext;
@@ -91,7 +90,7 @@ public class AmqpPortImpl extends AbstractPort
implements AmqpPort
@ManagedAttributeField
private int _numberOfSelectors;
-private final AtomicInteger _connectionCount = new AtomicInteger();
+private final AtomicLong _connectionCount = new AtomicLong();
private final AtomicBoolean _connectionCountWarningGiven = new
AtomicBoolean();
private final AtomicLong _totalConnectionCount = new AtomicLong();
@@ -551,69 +550,66 @@ public class AmqpPortImpl extends
AbstractPort implements AmqpPort
}
@Override
-public int incrementConnectionCount()
+public long decrementConnectionCount()
{
-int openConnections = _connectionCount.incrementAndGet();
-_totalConnectionCount.incrementAndGet();
-int maxOpenConnections = getMaxOpenConnections();
-if(maxOpenConnections > 0
- && openConnections > (maxOpenConnections * _connectionWarnCount) /
100
- && _connectionCountWarningGiven.compareAndSet(false, true))
-{
-_container.getEventLogger().message(new PortLogSubject(this),
-
PortMessages.CONNECTION_COUNT_WARN(openConnections,
-
_connectionWarnCount,
-
maxOpenConnections));
-}
-return openConnections;
-}
+final long maxOpenConnections = getMaxOpenConnections();
+final long openConnections = _connectionCount.decrementAndGet();
-@Override
-public int decrementConnectionCount()
-{
-int openConnections = _connectionCount.decrementAndGet();
-int maxOpenConnections = getMaxOpenConnections();
-
-if(maxOpenConnections > 0
- && openConnections < (maxOpenConnections *
square(_connectionWarnCount)) / 1)
+if (maxOpenConnections > 0L
+
[qpid-broker-j] branch 8.0.x updated: QPID-8452: Fix validation of maximum message size
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 78e52b7 QPID-8452: Fix validation of maximum message size
78e52b7 is described below
commit 78e52b7e344fe4e6b677dd097aadeb06342300f8
Author: Marek Laca
AuthorDate: Fri Jun 18 14:20:22 2021 +0200
QPID-8452: Fix validation of maximum message size
This closes #96
---
.../qpid/server/transport/AbstractAMQPConnection.java | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
index 2536036..74977c3 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
@@ -144,7 +144,7 @@ public abstract class AbstractAMQPConnection 0 ? maxMessageSize : Integer.MAX_VALUE;
}
catch (NullPointerException | IllegalArgumentException e)
{
LOGGER.warn("Context variable {} has invalid value and cannot be
used to restrict maximum message size",
- MAX_MESSAGE_SIZE,
- e);
-maxMessageSize = Long.MAX_VALUE;
+MAX_MESSAGE_SIZE,
+e);
}
-return maxMessageSize > 0 ? maxMessageSize : Long.MAX_VALUE;
+return Integer.MAX_VALUE;
}
@Override
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated: QPID-8452: Fix validation of maximum message size
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 03a9cf4 QPID-8452: Fix validation of maximum message size
03a9cf4 is described below
commit 03a9cf47a2cb23ae7044c023c0d0be8e31d207b0
Author: Marek Laca
AuthorDate: Fri Jun 18 14:20:22 2021 +0200
QPID-8452: Fix validation of maximum message size
This closes #96
---
.../qpid/server/transport/AbstractAMQPConnection.java | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
index 2536036..74977c3 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
@@ -144,7 +144,7 @@ public abstract class AbstractAMQPConnection 0 ? maxMessageSize : Integer.MAX_VALUE;
}
catch (NullPointerException | IllegalArgumentException e)
{
LOGGER.warn("Context variable {} has invalid value and cannot be
used to restrict maximum message size",
- MAX_MESSAGE_SIZE,
- e);
-maxMessageSize = Long.MAX_VALUE;
+MAX_MESSAGE_SIZE,
+e);
}
-return maxMessageSize > 0 ? maxMessageSize : Long.MAX_VALUE;
+return Integer.MAX_VALUE;
}
@Override
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-site] branch asf-site updated: NO-JIRA: Remove section 'staging'
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/qpid-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 35017af NO-JIRA: Remove section 'staging' 35017af is described below commit 35017afd1fb97588a9de1010ceba55adc660a4cc Author: Alex Rudyy AuthorDate: Sun Jun 20 12:29:11 2021 +0100 NO-JIRA: Remove section 'staging' --- .asf.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 3420f01..423b9fb 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -25,6 +25,3 @@ github: publish: whoami: asf-site -staging: - whoami: asf-site - - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-site] branch asf-site updated: NO-JIRA: Add publish and staging settings
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/qpid-site.git The following commit(s) were added to refs/heads/asf-site by this push: new bf4cb6e NO-JIRA: Add publish and staging settings bf4cb6e is described below commit bf4cb6e27fa1a704a71da6c312c4c05fb6c96299 Author: Alex Rudyy AuthorDate: Sun Jun 20 12:18:54 2021 +0100 NO-JIRA: Add publish and staging settings --- .asf.yaml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 2574c3c..3420f01 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -21,3 +21,10 @@ github: - qpid - apache - website + +publish: + whoami: asf-site + +staging: + whoami: asf-site + - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-site] branch asf-site updated: Update release notes for Qpid Broker-J 8.0.5
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/qpid-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 4523853 Update release notes for Qpid Broker-J 8.0.5 4523853 is described below commit 4523853982600922032ecfcc3acb1e6684678578 Author: Alex Rudyy AuthorDate: Sat Jun 19 19:13:03 2021 +0100 Update release notes for Qpid Broker-J 8.0.5 --- .../book/Apache-Qpid-Broker-J-Book.pdf | Bin 621428 -> 621428 bytes .../releases/qpid-broker-j-8.0.5/release-notes.md | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/input/releases/qpid-broker-j-8.0.5/book/Apache-Qpid-Broker-J-Book.pdf b/input/releases/qpid-broker-j-8.0.5/book/Apache-Qpid-Broker-J-Book.pdf index bb3a92f..c63b77b 100644 Binary files a/input/releases/qpid-broker-j-8.0.5/book/Apache-Qpid-Broker-J-Book.pdf and b/input/releases/qpid-broker-j-8.0.5/book/Apache-Qpid-Broker-J-Book.pdf differ diff --git a/input/releases/qpid-broker-j-8.0.5/release-notes.md b/input/releases/qpid-broker-j-8.0.5/release-notes.md index e822ae3..3d598a2 100644 --- a/input/releases/qpid-broker-j-8.0.5/release-notes.md +++ b/input/releases/qpid-broker-j-8.0.5/release-notes.md @@ -43,8 +43,9 @@ documentation, see the [release overview](index.html). - [QPID-8520](https://issues.apache.org/jira/browse/QPID-8520) - [Broker-J] ReadPendingException thrown by Broker-J intermittently - [QPID-8525](https://issues.apache.org/jira/browse/QPID-8525) - [Broker-J] An attempt to add a duplicate member or group into group provider of type GroupFile results in a removal of existing member or group from a file where data is stored - [QPID-8526](https://issues.apache.org/jira/browse/QPID-8526) - [Broker-J] Connection looping in NonBlockingConnectionTLSDelegate.doWrite() - - [QPID-8529](https://issues.apache.org/jira/browse/QPID-8529) - [Broker-J] NPE when trying to access digestCrecentials in the cached mode + - [QPID-8529](https://issues.apache.org/jira/browse/QPID-8529) - [Broker-J] NPE when trying to access cached user credentials ## Tasks - - [QPID-8537](https://issues.apache.org/jira/browse/QPID-8537) - [Broker-J] Replace use of constructors marked deprecated for-removal \ No newline at end of file + - [QPID-8537](https://issues.apache.org/jira/browse/QPID-8537) - [Broker-J] Replace use of constructors marked deprecated for-removal + - [QPID-8540](https://issues.apache.org/jira/browse/QPID-8540) - [Broker-J] Release Qpid Broker-J 8.0.5 \ No newline at end of file - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r48428 - /release/qpid/broker-j/8.0.5/
Author: orudyy Date: Fri Jun 18 15:53:52 2021 New Revision: 48428 Log: Apache Qpid Broker-J Added: release/qpid/broker-j/8.0.5/ - copied from r48427, dev/qpid/broker-j/8.0.5-rc1/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8541: [Broker-J] Restore API backward compatibility
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 7a064a475c1cea94a737d4dc4e8e8f0c99d61b2f
Author: Alex Rudyy
AuthorDate: Wed Jun 16 17:15:01 2021 +0100
QPID-8541: [Broker-J] Restore API backward compatibility
---
.../apache/qpid/server/security/FileKeyStoreImpl.java| 2 +-
.../apache/qpid/server/security/FileTrustStoreImpl.java | 2 +-
.../server/transport/network/security/ssl/SSLUtil.java | 16 +++-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
index 52df108..d23d4e3 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
@@ -137,7 +137,7 @@ public class FileKeyStoreImpl extends
AbstractKeyStore impleme
{
try
{
-_certificates =
Collections.unmodifiableMap(SSLUtil.getCertificates(getInitializedKeyStore(this)));
+_certificates =
Collections.unmodifiableMap(SSLUtil.getCertificatesAsMap(getInitializedKeyStore(this)));
}
catch (GeneralSecurityException | IOException e)
{
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
index e2f7342..76e4b0d 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
@@ -295,7 +295,7 @@ public class FileTrustStoreImpl extends
AbstractTrustStore i
{
final KeyStore ts = initializeKeyStore(this);
trustManagers = createTrustManagers(ts);
-certificates =
Collections.unmodifiableMap(SSLUtil.getCertificates(ts));
+certificates =
Collections.unmodifiableMap(SSLUtil.getCertificatesAsMap(ts));
}
catch (Exception e)
{
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
index 2e62faa..ad13436 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
@@ -1053,7 +1053,21 @@ public class SSLUtil
}
-public static Map getCertificates(final KeyStore ks)
throws KeyStoreException
+/**
+ * Get keystore certificates
+ * @deprecated
+ * The signature of this method is changed in version 9.0 and onwards.
+ * Use {@link SSLUtil#getCertificatesAsMap(KeyStore)} instead.
+ *
+ * @return cllection of keystore certificates
+ */
+@Deprecated
+public static Collection getCertificates(final KeyStore ks)
throws KeyStoreException
+{
+return getCertificatesAsMap(ks).values();
+}
+
+public static Map getCertificatesAsMap(final KeyStore
ks) throws KeyStoreException
{
final Map certificates = new HashMap<>();
final Enumeration aliases = ks.aliases();
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8541: [Broker-J] Enhance Broker Rest API to include certificate alias
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit b64ca15d654fc188c55420e30d35dbdc77c8ca35
Author: Marek Laca
AuthorDate: Tue Jun 15 18:03:59 2021 +0200
QPID-8541: [Broker-J] Enhance Broker Rest API to include certificate alias
This closes #95
---
.../qpid/server/security/CertificateDetails.java | 2 +-
.../server/security/CertificateDetailsImpl.java| 20 +-
.../qpid/server/security/FileKeyStoreImpl.java | 25 +---
.../qpid/server/security/FileTrustStoreImpl.java | 44 +-
.../transport/network/security/ssl/SSLUtil.java| 12 +++---
.../qpid/management/store/CertificateGridWidget.js | 12 --
6 files changed, 80 insertions(+), 35 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java
b/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java
index 41f9bfe..1ea0483 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java
@@ -37,5 +37,5 @@ public interface CertificateDetails extends
ManagedAttributeValue
List getSubjectAltNames();
Date getValidFrom();
Date getValidUntil();
-
+String getAlias();
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetailsImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetailsImpl.java
index 8561b59..1592e07 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetailsImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetailsImpl.java
@@ -28,6 +28,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import org.apache.qpid.server.model.ManagedAttributeValue;
@@ -35,9 +36,18 @@ public class CertificateDetailsImpl implements
CertificateDetails, ManagedAttrib
{
private final X509Certificate _x509cert;
-public CertificateDetailsImpl(final X509Certificate x509cert)
+private final String _alias;
+
+public CertificateDetailsImpl(X509Certificate x509cert)
+{
+this(x509cert, null);
+}
+
+public CertificateDetailsImpl(X509Certificate x509cert, String alias)
{
-_x509cert = x509cert;
+super();
+_x509cert = Objects.requireNonNull(x509cert);
+_alias = alias;
}
@Override
@@ -108,4 +118,10 @@ public class CertificateDetailsImpl implements
CertificateDetails, ManagedAttrib
{
return _x509cert.getNotAfter();
}
+
+@Override
+public String getAlias()
+{
+return _alias;
+}
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
index b6c6c1a..52df108 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
@@ -29,13 +29,16 @@ import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.UnrecoverableKeyException;
import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
+import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
@@ -80,7 +83,7 @@ public class FileKeyStoreImpl extends
AbstractKeyStore impleme
@ManagedAttributeField
private String _password;
-private volatile Collection _certificates;
+private volatile Map _certificates =
Collections.emptyMap();
static
{
@@ -132,16 +135,14 @@ public class FileKeyStoreImpl extends
AbstractKeyStore impleme
private void initialize()
{
-Collection result;
try
{
-result =
Collections.unmodifiableCollection(SSLUtil.getCertificates(getInitializedKeyStore(this)));
+_certificates =
Collections.unmodifiableMap(SSLUtil.getCertificates(getInitializedKeyStore(this)));
}
catch (GeneralSecurityException | IOException e)
{
throw new IllegalConfigurationException(String.format("Cannot
instantiate keystore '%s'", getName()), e);
}
-_certificates = result;
}
@Override
@@ -401,10 +402,22 @@ public class FileKeyStoreImpl extends
AbstractKeyStore impleme
}
@Override
+public List getCertific
[qpid-broker-j] branch 8.0.x updated (c547b50 -> 7a064a4)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from c547b50 [maven-release-plugin] prepare for next development iteration new b64ca15 QPID-8541: [Broker-J] Enhance Broker Rest API to include certificate alias new 7a064a4 QPID-8541: [Broker-J] Restore API backward compatibility The 2 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: .../qpid/server/security/CertificateDetails.java | 2 +- .../server/security/CertificateDetailsImpl.java| 20 +- .../qpid/server/security/FileKeyStoreImpl.java | 25 +--- .../qpid/server/security/FileTrustStoreImpl.java | 44 +- .../transport/network/security/ssl/SSLUtil.java| 24 ++-- .../qpid/management/store/CertificateGridWidget.js | 12 -- 6 files changed, 93 insertions(+), 34 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated: QPID-8541: [Broker-J] Enhance Broker Rest API to include certificate alias
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new dca5e9b QPID-8541: [Broker-J] Enhance Broker Rest API to include
certificate alias
dca5e9b is described below
commit dca5e9b810f4e3eb72088044d624c72516f1f35d
Author: Marek Laca
AuthorDate: Tue Jun 15 18:03:59 2021 +0200
QPID-8541: [Broker-J] Enhance Broker Rest API to include certificate alias
This closes #95
---
.../qpid/server/security/CertificateDetails.java | 2 +-
.../server/security/CertificateDetailsImpl.java| 20 +-
.../qpid/server/security/FileKeyStoreImpl.java | 25 +---
.../qpid/server/security/FileTrustStoreImpl.java | 44 +-
.../transport/network/security/ssl/SSLUtil.java| 12 +++---
.../qpid/management/store/CertificateGridWidget.js | 12 --
6 files changed, 80 insertions(+), 35 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java
b/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java
index 41f9bfe..1ea0483 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java
@@ -37,5 +37,5 @@ public interface CertificateDetails extends
ManagedAttributeValue
List getSubjectAltNames();
Date getValidFrom();
Date getValidUntil();
-
+String getAlias();
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetailsImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetailsImpl.java
index 8561b59..1592e07 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetailsImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetailsImpl.java
@@ -28,6 +28,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import org.apache.qpid.server.model.ManagedAttributeValue;
@@ -35,9 +36,18 @@ public class CertificateDetailsImpl implements
CertificateDetails, ManagedAttrib
{
private final X509Certificate _x509cert;
-public CertificateDetailsImpl(final X509Certificate x509cert)
+private final String _alias;
+
+public CertificateDetailsImpl(X509Certificate x509cert)
+{
+this(x509cert, null);
+}
+
+public CertificateDetailsImpl(X509Certificate x509cert, String alias)
{
-_x509cert = x509cert;
+super();
+_x509cert = Objects.requireNonNull(x509cert);
+_alias = alias;
}
@Override
@@ -108,4 +118,10 @@ public class CertificateDetailsImpl implements
CertificateDetails, ManagedAttrib
{
return _x509cert.getNotAfter();
}
+
+@Override
+public String getAlias()
+{
+return _alias;
+}
}
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
index b6c6c1a..52df108 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
@@ -29,13 +29,16 @@ import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.UnrecoverableKeyException;
import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
+import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
@@ -80,7 +83,7 @@ public class FileKeyStoreImpl extends
AbstractKeyStore impleme
@ManagedAttributeField
private String _password;
-private volatile Collection _certificates;
+private volatile Map _certificates =
Collections.emptyMap();
static
{
@@ -132,16 +135,14 @@ public class FileKeyStoreImpl extends
AbstractKeyStore impleme
private void initialize()
{
-Collection result;
try
{
-result =
Collections.unmodifiableCollection(SSLUtil.getCertificates(getInitializedKeyStore(this)));
+_certificates =
Collections.unmodifiableMap(SSLUtil.getCertificates(getInitializedKeyStore(this)));
}
catch (GeneralSecurityException | IOException e)
{
throw new IllegalConfigurationException(String.format("Cannot
instantiate keystore '%s'", getName()), e);
}
-_certificate
svn commit: r48362 - in /dev/qpid/broker-j/8.0.5-rc1: ./ binaries/
Author: orudyy Date: Tue Jun 15 11:54:12 2021 New Revision: 48362 Log: Apache Qpid Broker-J 8.0.5 RC1 Added: dev/qpid/broker-j/8.0.5-rc1/ dev/qpid/broker-j/8.0.5-rc1/apache-qpid-broker-j-8.0.5-src.tar.gz (with props) dev/qpid/broker-j/8.0.5-rc1/apache-qpid-broker-j-8.0.5-src.tar.gz.asc (with props) dev/qpid/broker-j/8.0.5-rc1/apache-qpid-broker-j-8.0.5-src.tar.gz.sha512 dev/qpid/broker-j/8.0.5-rc1/binaries/ dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.tar.gz (with props) dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.tar.gz.asc (with props) dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.tar.gz.sha512 dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.zip (with props) dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.zip.asc (with props) dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.zip.sha512 Added: dev/qpid/broker-j/8.0.5-rc1/apache-qpid-broker-j-8.0.5-src.tar.gz == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.5-rc1/apache-qpid-broker-j-8.0.5-src.tar.gz -- svn:mime-type = application/gzip Added: dev/qpid/broker-j/8.0.5-rc1/apache-qpid-broker-j-8.0.5-src.tar.gz.asc == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.5-rc1/apache-qpid-broker-j-8.0.5-src.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/qpid/broker-j/8.0.5-rc1/apache-qpid-broker-j-8.0.5-src.tar.gz.sha512 == --- dev/qpid/broker-j/8.0.5-rc1/apache-qpid-broker-j-8.0.5-src.tar.gz.sha512 (added) +++ dev/qpid/broker-j/8.0.5-rc1/apache-qpid-broker-j-8.0.5-src.tar.gz.sha512 Tue Jun 15 11:54:12 2021 @@ -0,0 +1 @@ +78060609b4f0833379d5c036dafb33d2ce402d059cef7a28b9bb543c4ef733c395330316ab2b5fb494b53b54c60497a33b4f71e25857106b98fdd4706713d8d7 apache-qpid-broker-j-8.0.5-src.tar.gz Added: dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.tar.gz == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.tar.gz -- svn:mime-type = application/gzip Added: dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.tar.gz.asc == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.tar.gz.sha512 == --- dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.tar.gz.sha512 (added) +++ dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.tar.gz.sha512 Tue Jun 15 11:54:12 2021 @@ -0,0 +1 @@ +1ee616df316e08704c60bf7a31a62ba175bc1b8812454bb61e3666dad19835a7740347d06a760efde3f748c1150965a9ceca7ccb031e118562490e569cbffcff apache-qpid-broker-j-8.0.5-bin.tar.gz Added: dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.zip == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.zip -- svn:mime-type = application/zip Added: dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.zip.asc == Binary file - no diff available. Propchange: dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.zip.sha512 == --- dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.zip.sha512 (added) +++ dev/qpid/broker-j/8.0.5-rc1/binaries/apache-qpid-broker-j-8.0.5-bin.zip.sha512 Tue Jun 15 11:54:12 2021 @@ -0,0 +1
[qpid-broker-j] branch 8.0.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/8.0.x by this push: new c547b50 [maven-release-plugin] prepare for next development iteration c547b50 is described below commit c547b50348ec48878d717c2af801382e235dc5b2 Author: Alex Rudyy AuthorDate: Tue Jun 15 12:36:13 2021 +0100 [maven-release-plugin] prepare for next development iteration --- apache-qpid-broker-j/pom.xml | 2 +- bdbstore/pom.xml | 2 +- bdbstore/systests/pom.xml| 2 +- broker-codegen/pom.xml | 2 +- broker-core/pom.xml | 2 +- broker-plugins/access-control/pom.xml| 2 +- broker-plugins/amqp-0-10-protocol/pom.xml| 2 +- broker-plugins/amqp-0-8-protocol/pom.xml | 2 +- broker-plugins/amqp-1-0-bdb-store/pom.xml| 2 +- broker-plugins/amqp-1-0-jdbc-store/pom.xml | 2 +- broker-plugins/amqp-1-0-protocol/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml | 2 +- broker-plugins/derby-store/pom.xml | 2 +- broker-plugins/jdbc-logging-logback/pom.xml | 2 +- broker-plugins/jdbc-provider-bone/pom.xml| 2 +- broker-plugins/jdbc-store/pom.xml| 2 +- broker-plugins/logging-logback/pom.xml | 2 +- broker-plugins/management-amqp/pom.xml | 2 +- broker-plugins/management-http/pom.xml | 2 +- broker-plugins/memory-store/pom.xml | 2 +- broker-plugins/prometheus-exporter/pom.xml | 2 +- broker-plugins/websocket/pom.xml | 2 +- broker/pom.xml | 2 +- doc/developer-guide/pom.xml | 2 +- doc/java-broker/pom.xml | 2 +- doc/java-perftests/pom.xml | 2 +- doc/pom.xml | 2 +- joramtests/pom.xml | 2 +- perftests/pom.xml| 2 +- perftests/visualisation-jfc/pom.xml | 2 +- pom.xml | 4 ++-- qpid-perftests-systests/pom.xml | 2 +- qpid-systests-parent/pom.xml | 4 ++-- qpid-test-utils/pom.xml | 2 +- systests/end-to-end-conversion-tests/pom.xml | 2 +- systests/protocol-tests-amqp-0-10/pom.xml| 2 +- systests/protocol-tests-amqp-0-8/pom.xml | 2 +- systests/protocol-tests-amqp-1-0/pom.xml | 2 +- systests/protocol-tests-core/pom.xml | 2 +- systests/qpid-systests-http-management/pom.xml | 2 +- systests/qpid-systests-jms-core/pom.xml | 2 +- systests/qpid-systests-jms_1.1/pom.xml | 2 +- systests/qpid-systests-jms_2.0/pom.xml | 2 +- systests/qpid-systests-spawn-admin/pom.xml | 2 +- systests/systests-utils/pom.xml | 2 +- tck/pom.xml | 2 +- tools/pom.xml| 2 +- 49 files changed, 51 insertions(+), 51 deletions(-) diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml index 6ac6ef7..6f56976 100644 --- a/apache-qpid-broker-j/pom.xml +++ b/apache-qpid-broker-j/pom.xml @@ -18,7 +18,7 @@ org.apache.qpid qpid-broker-parent -8.0.5 +8.0.6-SNAPSHOT 4.0.0 diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml index 21956dd..28886d9 100644 --- a/bdbstore/pom.xml +++ b/bdbstore/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.5 +8.0.6-SNAPSHOT qpid-bdbstore diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml index 94f8e0e..c0f111d 100644 --- a/bdbstore/systests/pom.xml +++ b/bdbstore/systests/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-systests-parent -8.0.5 +8.0.6-SNAPSHOT ../../qpid-systests-parent/pom.xml diff --git a/broker-codegen/pom.xml b/broker-codegen/pom.xml index 93869b3..c3ab944 100644 --- a/broker-codegen/pom.xml +++ b/broker-codegen/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.5 +8.0.6-SNAPSHOT qpid-broker-codegen diff --git a/broker-core/pom.xml b/broker-core/pom.xml index ce12aee..62af2cb 100644 --- a/broker-core/pom.xml +++ b/broker-core/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.5 +8.0.6-SNAPSHOT qpid-broker-core diff --git a/broker-plugins/access-control/pom.xml b/broker-plugins/access-control/pom.xml index 805f6f4..34c6b47 100644 --- a/broker-plugins/access-control/pom.xml +++ b/broker-plugins/access-control/pom.xml @@ -21,7 +21,7
[qpid-broker-j] annotated tag 8.0.5 created (now 225e393)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to annotated tag 8.0.5 in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. at 225e393 (tag) tagging a5c8ddceb23c219963b8ac3edde03be56369b47f (commit) replaces 8.0.4 by Alex Rudyy on Tue Jun 15 12:36:08 2021 +0100 - Log - [maven-release-plugin] copy for tag 8.0.5 --- No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated: [maven-release-plugin] prepare release 8.0.5
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/8.0.x by this push: new a5c8ddc [maven-release-plugin] prepare release 8.0.5 a5c8ddc is described below commit a5c8ddceb23c219963b8ac3edde03be56369b47f Author: Alex Rudyy AuthorDate: Tue Jun 15 12:35:52 2021 +0100 [maven-release-plugin] prepare release 8.0.5 --- apache-qpid-broker-j/pom.xml | 2 +- bdbstore/pom.xml | 2 +- bdbstore/systests/pom.xml| 2 +- broker-codegen/pom.xml | 2 +- broker-core/pom.xml | 2 +- broker-plugins/access-control/pom.xml| 2 +- broker-plugins/amqp-0-10-protocol/pom.xml| 2 +- broker-plugins/amqp-0-8-protocol/pom.xml | 2 +- broker-plugins/amqp-1-0-bdb-store/pom.xml| 2 +- broker-plugins/amqp-1-0-jdbc-store/pom.xml | 2 +- broker-plugins/amqp-1-0-protocol/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml | 2 +- broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml | 2 +- broker-plugins/derby-store/pom.xml | 2 +- broker-plugins/jdbc-logging-logback/pom.xml | 2 +- broker-plugins/jdbc-provider-bone/pom.xml| 2 +- broker-plugins/jdbc-store/pom.xml| 2 +- broker-plugins/logging-logback/pom.xml | 2 +- broker-plugins/management-amqp/pom.xml | 2 +- broker-plugins/management-http/pom.xml | 2 +- broker-plugins/memory-store/pom.xml | 2 +- broker-plugins/prometheus-exporter/pom.xml | 2 +- broker-plugins/websocket/pom.xml | 2 +- broker/pom.xml | 2 +- doc/developer-guide/pom.xml | 2 +- doc/java-broker/pom.xml | 2 +- doc/java-perftests/pom.xml | 2 +- doc/pom.xml | 2 +- joramtests/pom.xml | 2 +- perftests/pom.xml| 2 +- perftests/visualisation-jfc/pom.xml | 2 +- pom.xml | 4 ++-- qpid-perftests-systests/pom.xml | 2 +- qpid-systests-parent/pom.xml | 4 ++-- qpid-test-utils/pom.xml | 2 +- systests/end-to-end-conversion-tests/pom.xml | 2 +- systests/protocol-tests-amqp-0-10/pom.xml| 2 +- systests/protocol-tests-amqp-0-8/pom.xml | 2 +- systests/protocol-tests-amqp-1-0/pom.xml | 2 +- systests/protocol-tests-core/pom.xml | 2 +- systests/qpid-systests-http-management/pom.xml | 2 +- systests/qpid-systests-jms-core/pom.xml | 2 +- systests/qpid-systests-jms_1.1/pom.xml | 2 +- systests/qpid-systests-jms_2.0/pom.xml | 2 +- systests/qpid-systests-spawn-admin/pom.xml | 2 +- systests/systests-utils/pom.xml | 2 +- tck/pom.xml | 2 +- tools/pom.xml| 2 +- 49 files changed, 51 insertions(+), 51 deletions(-) diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml index 7a56d47..6ac6ef7 100644 --- a/apache-qpid-broker-j/pom.xml +++ b/apache-qpid-broker-j/pom.xml @@ -18,7 +18,7 @@ org.apache.qpid qpid-broker-parent -8.0.5-SNAPSHOT +8.0.5 4.0.0 diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml index 6e71a0d..21956dd 100644 --- a/bdbstore/pom.xml +++ b/bdbstore/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.5-SNAPSHOT +8.0.5 qpid-bdbstore diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml index 4518aa7..94f8e0e 100644 --- a/bdbstore/systests/pom.xml +++ b/bdbstore/systests/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-systests-parent -8.0.5-SNAPSHOT +8.0.5 ../../qpid-systests-parent/pom.xml diff --git a/broker-codegen/pom.xml b/broker-codegen/pom.xml index c4fafad..93869b3 100644 --- a/broker-codegen/pom.xml +++ b/broker-codegen/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.5-SNAPSHOT +8.0.5 qpid-broker-codegen diff --git a/broker-core/pom.xml b/broker-core/pom.xml index 7d05b3f..ce12aee 100644 --- a/broker-core/pom.xml +++ b/broker-core/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid-broker-parent -8.0.5-SNAPSHOT +8.0.5 qpid-broker-core diff --git a/broker-plugins/access-control/pom.xml b/broker-plugins/access-control/pom.xml index bfd5d27..805f6f4 100644 --- a/broker-plugins/access-control/pom.xml +++ b/broker-plugins/access-control/pom.xml @@ -21,7 +21,7 @@ org.apache.qpid qpid
[qpid-broker-j] branch 8.0.x updated: NO-JIRA: Update dependency reference files
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/8.0.x by this push: new 47f5a2d NO-JIRA: Update dependency reference files 47f5a2d is described below commit 47f5a2d436f36f2c69a05055d4c3593e3060fff9 Author: Alex Rudyy AuthorDate: Wed Mar 31 01:45:40 2021 +0100 NO-JIRA: Update dependency reference files --- .../src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 7267045..59f6b5b 100644 --- a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -123,7 +123,7 @@ From: 'The Apache Software Foundation' (https://www.apache.org/) License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) From: 'The CometD Project' (https://cometd.org) - - Dojo Toolkit :: Bundles (http://dojotoolkit.org/dojo) org.dojotoolkit:dojo:pom:1.16.0 + - Dojo Toolkit :: Bundles (http://dojotoolkit.org/dojo) org.dojotoolkit:dojo:pom:1.16.3 License: Academic Free License v2.1 (https://github.com/dojo/dojo/blob/master/LICENSE)License: BSD License (https://github.com/dojo/dojo/blob/master/LICENSE) From: 'Webtide' (https://webtide.com) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated: QPID-8539:[Broker-J] Update dependecy references
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/8.0.x by this push: new b8c6924 QPID-8539:[Broker-J] Update dependecy references b8c6924 is described below commit b8c6924d8aa39a0e472f54643c5c316addb410aa Author: Alex Rudyy AuthorDate: Tue Jun 15 12:18:56 2021 +0100 QPID-8539:[Broker-J] Update dependecy references --- .../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE| 6 +++--- .../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE| 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 3659614..7267045 100644 --- a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -43,11 +43,11 @@ From: 'Apache Software Foundation' (http://db.apache.org/) License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'FasterXML' (http://fasterxml.com/) - - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.1 + - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.1 + - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.1 + - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'GlassFish Community' (https://glassfish.dev.java.net) diff --git a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 113d3fc..1532d60 100644 --- a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -35,11 +35,11 @@ From: 'Apache Software Foundation' (http://www.apache.org) License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'FasterXML' (http://fasterxml.com/) - - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.1 + - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.1 + - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.1 + - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'QOS.ch' (http://www.qos.ch) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated: QPID-8539:[Broker-J] Update dependecy references
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/main by this push: new 1aaf855 QPID-8539:[Broker-J] Update dependecy references 1aaf855 is described below commit 1aaf855a86e9601be47d6df182b167d32bb944f8 Author: Alex Rudyy AuthorDate: Tue Jun 15 12:18:56 2021 +0100 QPID-8539:[Broker-J] Update dependecy references --- .../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE| 6 +++--- .../main/assembly/dependency-verification/DEPENDENCIES_REFERENCE| 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 2d5e3cb..59f6b5b 100644 --- a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -43,11 +43,11 @@ From: 'Apache Software Foundation' (http://db.apache.org/) License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'FasterXML' (http://fasterxml.com/) - - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.1 + - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.1 + - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.1 + - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'GlassFish Community' (https://glassfish.dev.java.net) diff --git a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE index 113d3fc..1532d60 100644 --- a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE +++ b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE @@ -35,11 +35,11 @@ From: 'Apache Software Foundation' (http://www.apache.org) License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'FasterXML' (http://fasterxml.com/) - - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.1 + - Jackson-annotations (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-annotations:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.1 + - Jackson-core (https://github.com/FasterXML/jackson-core) com.fasterxml.jackson.core:jackson-core:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.1 + - jackson-databind (http://github.com/FasterXML/jackson) com.fasterxml.jackson.core:jackson-databind:bundle:2.12.3 License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) From: 'QOS.ch' (http://www.qos.ch) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/03: NO-JIRA: alternative approach to only using the repo for bdb dep where really needed, to speed up build
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 5f1b8d94d64f851f23b3b49a3fef41cabeca968f
Author: Robbie Gemmell
AuthorDate: Mon Jun 14 12:15:51 2021 +0100
NO-JIRA: alternative approach to only using the repo for bdb dep where
really needed, to speed up build
Although core build worked fine with prev version, it seemed to cause issue
with CI 'checks' job failing.
---
apache-qpid-broker-j/pom.xml | 1 +
bdbstore/pom.xml | 19 ---
pom.xml | 17 +
3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/apache-qpid-broker-j/pom.xml b/apache-qpid-broker-j/pom.xml
index a2347fc..7a56d47 100644
--- a/apache-qpid-broker-j/pom.xml
+++ b/apache-qpid-broker-j/pom.xml
@@ -28,6 +28,7 @@
true
+true
diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml
index e761c1d..6e71a0d 100644
--- a/bdbstore/pom.xml
+++ b/bdbstore/pom.xml
@@ -28,6 +28,10 @@
Apache Qpid Broker-J BDB Message Store Plug-in
BDB message store implementation using Oracle Berkeley DB Java
Edition
+
+true
+
+
org.apache.qpid
@@ -78,21 +82,6 @@
-
-
-
- oracle.releases
- https://download.oracle.com/maven
- default
-
-true
-
-
-false
-
-
-
-
diff --git a/pom.xml b/pom.xml
index e9e8435..b9b5a01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,8 @@
1.68
1.68
0.9.0
+
+false
@@ -1104,6 +1106,21 @@
+
+
+
+ oracle.releases
+ https://download.oracle.com/maven
+ default
+
+${bdb-repo-enabled}
+
+
+false
+
+
+
+
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 03/03: QPID-8539:[Broker-J] Upgrade jackson dependecies
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git commit c95ece3309876f76c933027010b40b9dc4d906be Author: Dedeepya T AuthorDate: Tue Jun 15 15:14:30 2021 +0530 QPID-8539:[Broker-J] Upgrade jackson dependecies This closes #94 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b9b5a01..552678e 100644 --- a/pom.xml +++ b/pom.xml @@ -105,8 +105,8 @@ 10.14.2.0 1.2.3 30.0-jre -2.12.1 - 2.12.1 +2.12.3 + 2.12.3 1.7.30 9.4.35.v20201120 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated (32df27b -> c95ece3)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from 32df27b QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only when role is a sender new 6b7ff4c NO-JIRA: move repo definition for bdb dep into bdbstore module where needed, speed up build new 5f1b8d9 NO-JIRA: alternative approach to only using the repo for bdb dep where really needed, to speed up build new c95ece3 QPID-8539:[Broker-J] Upgrade jackson dependecies The 3 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: apache-qpid-broker-j/pom.xml | 1 + bdbstore/pom.xml | 4 pom.xml | 10 ++ 3 files changed, 11 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/03: NO-JIRA: move repo definition for bdb dep into bdbstore module where needed, speed up build
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git commit 6b7ff4c3b5116098a7b7fa3b594b198ca40d0ed3 Author: Robbie Gemmell AuthorDate: Wed Jun 9 14:35:54 2021 +0100 NO-JIRA: move repo definition for bdb dep into bdbstore module where needed, speed up build The repo is slow, and due to being in the root pom it is tried first for many files that will never be found in the repo. Only the bdbstore module needs it, for 2 files, but it is tried for >400 files that will never be found there. Reduces build time on clean install from ~7.5min to ~2min --- bdbstore/pom.xml | 15 +++ pom.xml | 15 --- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml index d0921ba..e761c1d 100644 --- a/bdbstore/pom.xml +++ b/bdbstore/pom.xml @@ -78,6 +78,21 @@ + + + + oracle.releases + https://download.oracle.com/maven + default + +true + + +false + + + + diff --git a/pom.xml b/pom.xml index 3f94166..e9e8435 100644 --- a/pom.xml +++ b/pom.xml @@ -1104,21 +1104,6 @@ - - - - oracle.releases - https://download.oracle.com/maven - default - -true - - -false - - - - - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated: QPID-8539:[Broker-J] Upgrade jackson dependecies
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/main by this push: new 5b742ba QPID-8539:[Broker-J] Upgrade jackson dependecies 5b742ba is described below commit 5b742baceef176820c55dfed353a4fd8f90c9531 Author: Dedeepya T AuthorDate: Tue Jun 15 15:14:30 2021 +0530 QPID-8539:[Broker-J] Upgrade jackson dependecies This closes #94 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eaf3b06..ff4f4ea 100644 --- a/pom.xml +++ b/pom.xml @@ -106,8 +106,8 @@ 10.14.2.0 1.2.3 30.0-jre -2.12.1 - 2.12.1 +2.12.3 + 2.12.3 1.7.30 9.4.35.v20201120 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only when role is a sender
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 32df27b195cc6398161d82b1398a858e4a8d2045
Author: Alex Rudyy
AuthorDate: Tue Jun 15 09:20:23 2021 +0100
QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only
when role is a sender
---
.../org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
index a12198e..42d756a 100644
---
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
+++
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
@@ -90,7 +90,10 @@ public class ErrantLinkEndpoint impl
attachToSend.setName(_link.getName());
attachToSend.setRole(getRole());
attachToSend.setHandle(getLocalHandle());
-attachToSend.setInitialDeliveryCount(UnsignedInteger.ZERO);
+if (getRole() == Role.SENDER)
+{
+attachToSend.setInitialDeliveryCount(UnsignedInteger.ZERO);
+}
attachToSend.setSource(getSource());
attachToSend.setTarget(getTarget());
_session.sendAttach(attachToSend);
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8523:[Broker-J] Set initial-delivery-count in a response attach when destination is not found
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git commit e04f933c2fe223624b9921d00f11e4e8bb6a74d1 Author: Dedeepya T AuthorDate: Mon Jun 14 18:43:20 2021 +0530 QPID-8523:[Broker-J] Set initial-delivery-count in a response attach when destination is not found This closes #92 --- .../java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java| 1 + .../org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java index 1bd9604..a12198e 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java @@ -90,6 +90,7 @@ public class ErrantLinkEndpoint impl attachToSend.setName(_link.getName()); attachToSend.setRole(getRole()); attachToSend.setHandle(getLocalHandle()); +attachToSend.setInitialDeliveryCount(UnsignedInteger.ZERO); attachToSend.setSource(getSource()); attachToSend.setTarget(getTarget()); _session.sendAttach(attachToSend); diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java index cac9ecd..5aa0b37 100644 --- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java +++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java @@ -150,6 +150,7 @@ public class AttachTest extends BrokerAdminUsingTestBase assertThat(responseAttach.getName(), is(notNullValue())); assertThat(responseAttach.getHandle().longValue(), is(both(greaterThanOrEqualTo(0L)).and(lessThan(UnsignedInteger.MAX_VALUE.longValue(); assertThat(responseAttach.getRole(), is(Role.SENDER)); +assertThat(responseAttach.getInitialDeliveryCount(), is((UnsignedInteger.ZERO))); assertThat(responseAttach.getSource(), is(nullValue())); assertThat(responseAttach.getTarget(), is(nullValue())); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated (7368075 -> 32df27b)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from 7368075 QPID-8520: Substitute TlsOrPlainConnectionFactory with jetty OptionalSslConnectionFactory new e04f933 QPID-8523:[Broker-J] Set initial-delivery-count in a response attach when destination is not found new 32df27b QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only when role is a sender The 2 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: .../java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java | 4 .../apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java| 1 + 2 files changed, 5 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only when role is a sender
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 3f44105f80ac52e493d028c0cc43d861c55add62
Author: Alex Rudyy
AuthorDate: Tue Jun 15 09:20:23 2021 +0100
QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only
when role is a sender
---
.../org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
index a12198e..42d756a 100644
---
a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
+++
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
@@ -90,7 +90,10 @@ public class ErrantLinkEndpoint impl
attachToSend.setName(_link.getName());
attachToSend.setRole(getRole());
attachToSend.setHandle(getLocalHandle());
-attachToSend.setInitialDeliveryCount(UnsignedInteger.ZERO);
+if (getRole() == Role.SENDER)
+{
+attachToSend.setInitialDeliveryCount(UnsignedInteger.ZERO);
+}
attachToSend.setSource(getSource());
attachToSend.setTarget(getTarget());
_session.sendAttach(attachToSend);
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8523:[Broker-J] Set initial-delivery-count in a response attach when destination is not found
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git commit e561dcdd236e8d30de2e2138831798512776bfce Author: Dedeepya T AuthorDate: Mon Jun 14 18:43:20 2021 +0530 QPID-8523:[Broker-J] Set initial-delivery-count in a response attach when destination is not found This closes #92 --- .../java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java| 1 + .../org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java index 1bd9604..a12198e 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java @@ -90,6 +90,7 @@ public class ErrantLinkEndpoint impl attachToSend.setName(_link.getName()); attachToSend.setRole(getRole()); attachToSend.setHandle(getLocalHandle()); +attachToSend.setInitialDeliveryCount(UnsignedInteger.ZERO); attachToSend.setSource(getSource()); attachToSend.setTarget(getTarget()); _session.sendAttach(attachToSend); diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java index cac9ecd..5aa0b37 100644 --- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java +++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java @@ -150,6 +150,7 @@ public class AttachTest extends BrokerAdminUsingTestBase assertThat(responseAttach.getName(), is(notNullValue())); assertThat(responseAttach.getHandle().longValue(), is(both(greaterThanOrEqualTo(0L)).and(lessThan(UnsignedInteger.MAX_VALUE.longValue(); assertThat(responseAttach.getRole(), is(Role.SENDER)); +assertThat(responseAttach.getInitialDeliveryCount(), is((UnsignedInteger.ZERO))); assertThat(responseAttach.getSource(), is(nullValue())); assertThat(responseAttach.getTarget(), is(nullValue())); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated (9b396b4 -> 3f44105)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from 9b396b4 QPID-8520: [Broker-J] Remove Qpid port-unification support for Jetty new e561dcd QPID-8523:[Broker-J] Set initial-delivery-count in a response attach when destination is not found new 3f44105 QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only when role is a sender The 2 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: .../java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java | 4 .../apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java| 1 + 2 files changed, 5 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated (2b1a714 -> 7368075)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from 2b1a714 QPID-8483: [Broker-J] Report peer session name as part of 0-10 session subject new fee2a91 NO-JIRA: Fix sporadic test failure new 7368075 QPID-8520: Substitute TlsOrPlainConnectionFactory with jetty OptionalSslConnectionFactory The 2 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: .../server/management/plugin/HttpManagement.java | 16 ++-- .../authentication/PreemptiveAuthenticationTest.java | 20 ++-- 2 files changed, 8 insertions(+), 28 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8520: Substitute TlsOrPlainConnectionFactory with jetty OptionalSslConnectionFactory
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 7368075c69cce683e6d599e4ac7c18da6deed3cc
Author: Alex Rudyy
AuthorDate: Mon Jun 14 21:47:02 2021 +0100
QPID-8520: Substitute TlsOrPlainConnectionFactory with jetty
OptionalSslConnectionFactory
---
.../qpid/server/management/plugin/HttpManagement.java| 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 8e63c9f..374116e 100644
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -30,7 +30,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -53,12 +52,14 @@ import com.google.common.base.Joiner;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
+import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.ssl.SslHandshakeListener;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.NetworkConnector;
+import org.eclipse.jetty.server.OptionalSslConnectionFactory;
import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
@@ -87,7 +88,6 @@ import
org.apache.qpid.server.management.plugin.filter.InteractiveAuthentication
import org.apache.qpid.server.management.plugin.filter.LoggingFilter;
import org.apache.qpid.server.management.plugin.filter.RedirectFilter;
import
org.apache.qpid.server.management.plugin.filter.RewriteRequestForUncompressedJavascript;
-import
org.apache.qpid.server.management.plugin.portunification.TlsOrPlainConnectionFactory;
import org.apache.qpid.server.management.plugin.servlet.FileServlet;
import org.apache.qpid.server.management.plugin.servlet.RootServlet;
import org.apache.qpid.server.management.plugin.servlet.ContentServlet;
@@ -574,15 +574,11 @@ public class HttpManagement extends
AbstractPluginAdapter implem
else if (transports.contains(Transport.SSL))
{
sslContextFactory = createSslContextFactory(port);
-ConnectionFactory sslConnectionFactory;
+ConnectionFactory sslConnectionFactory =
+new SslConnectionFactory(sslContextFactory,
httpConnectionFactory.getProtocol());
if (port.getTransports().contains(Transport.TCP))
{
-sslConnectionFactory =
-new TlsOrPlainConnectionFactory(sslContextFactory,
httpConnectionFactory.getProtocol());
-}
-else
-{
-sslConnectionFactory = new
SslConnectionFactory(sslContextFactory, httpConnectionFactory.getProtocol());
+sslConnectionFactory = new
OptionalSslConnectionFactory((SslConnectionFactory)sslConnectionFactory,
HttpVersion.HTTP_1_1.asString());
}
connectionFactories = new
ConnectionFactory[]{sslConnectionFactory, httpConnectionFactory};
}
@@ -1072,7 +1068,7 @@ public class HttpManagement extends
AbstractPluginAdapter implem
private static class ConnectionTrackingListener implements
Connection.Listener
{
-private final Map> _closeFutures =
new HashMap<>();
+private final Map> _closeFutures =
new ConcurrentHashMap<>();
@Override
public void onOpened(final Connection connection)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: NO-JIRA: Fix sporadic test failure
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit fee2a918dc2eb049f131a867640154837d8de5ed
Author: Alex Rudyy
AuthorDate: Mon Jun 14 20:00:47 2021 +0100
NO-JIRA: Fix sporadic test failure
---
.../authentication/PreemptiveAuthenticationTest.java | 20 ++--
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
index 14db61d..12e5483 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
@@ -32,6 +32,7 @@ import static org.hamcrest.Matchers.startsWith;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.SocketException;
@@ -146,27 +147,10 @@ public class PreemptiveAuthenticationTest extends
HttpTestBase
helper.getJson("broker/getUser", STRING_TYPE_REF, SC_OK);
fail("Exception not thrown");
}
-catch (SSLHandshakeException e)
+catch (IOException e)
{
// PASS
}
-catch (SSLException e)
-{
-// PASS
-//
-// TLS 1.3 seems has an issue with handshake (some sort of race):
-// after the socket being closed on server side due to unknown
certificate,
-// the client is trying to flush output stream and gets "broken
pipe".
-//
-// The issue seems related to
https://bugs.openjdk.java.net/browse/JDK-8207009
-// There is still a problem with handshake in 11.0.4 and above
-//
-// Ignoring this issue... due to low impact of the issue on client
applications...
-}
-catch (SocketException e)
-{
-// TODO - defect - we are not always seeing the SSL handshake
exception
-}
}
@Test
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 03/03: QPID-8520: [Broker-J] Remove Qpid port-unification support for Jetty
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 9b396b409899283cce14d6a2253c73865faededa
Author: Alex Rudyy
AuthorDate: Mon Jun 14 22:07:18 2021 +0100
QPID-8520: [Broker-J] Remove Qpid port-unification support for Jetty
---
.../plugin/portunification/MarkableEndPoint.java | 275 ---
.../TlsOrPlainConnectionFactory.java | 375 -
.../TlsOrPlainConnectionFactoryTest.java | 196 ---
3 files changed, 846 deletions(-)
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/MarkableEndPoint.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/MarkableEndPoint.java
deleted file mode 100644
index 925fc35..000
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/MarkableEndPoint.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.server.management.plugin.portunification;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.ReadPendingException;
-import java.nio.channels.WritePendingException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jetty.io.Connection;
-import org.eclipse.jetty.io.EndPoint;
-import org.eclipse.jetty.util.BufferUtil;
-import org.eclipse.jetty.util.Callback;
-
-public class MarkableEndPoint implements EndPoint
-{
-private final EndPoint _underlying;
-private final List _preserved = new ArrayList<>();
-private volatile boolean _marked;
-
-MarkableEndPoint(final EndPoint underlying)
-{
-_underlying = underlying;
-}
-
-@Override
-public InetSocketAddress getLocalAddress()
-{
-return _underlying.getLocalAddress();
-}
-
-@Override
-public InetSocketAddress getRemoteAddress()
-{
-return _underlying.getRemoteAddress();
-}
-
-@Override
-public boolean isOpen()
-{
-return _underlying.isOpen();
-}
-
-@Override
-public long getCreatedTimeStamp()
-{
-return _underlying.getCreatedTimeStamp();
-}
-
-@Override
-public void shutdownOutput()
-{
-_underlying.shutdownOutput();
-}
-
-@Override
-public boolean isOutputShutdown()
-{
-return _underlying.isOutputShutdown();
-}
-
-@Override
-public boolean isInputShutdown()
-{
-return _underlying.isInputShutdown();
-}
-
-@Override
-public void close()
-{
-_underlying.close();
-}
-
-@Override
-public boolean flush(final ByteBuffer... buffer) throws IOException
-{
-return _underlying.flush(buffer);
-}
-
-@Override
-public Object getTransport()
-{
-return _underlying.getTransport();
-}
-
-@Override
-public long getIdleTimeout()
-{
-return _underlying.getIdleTimeout();
-}
-
-@Override
-public void setIdleTimeout(final long idleTimeout)
-{
-_underlying.setIdleTimeout(idleTimeout);
-}
-
-@Override
-public void fillInterested(final Callback callback) throws
ReadPendingException
-{
-_underlying.fillInterested(callback);
-}
-
-@Override
-public boolean tryFillInterested(final Callback callback)
-{
-return _underlying.tryFillInterested(callback);
-}
-
-@Override
-public boolean isFillInterested()
-{
-return _underlying.isFillInterested();
-}
-
-@Override
-public void write(final Callback callback, final ByteBuffer... buffers)
throws WritePendingException
-{
-_underlying.write(callback, buffers);
-}
-
-@Override
-public Connection getConnection()
-{
-return _underlying.getConnection();
-}
-
-@Override
-public void setConnection(final Connection connection)
-{
-_underlyin
[qpid-broker-j] 02/03: QPID-8520: [Broker-J] Substitute TlsOrPlainConnectionFactory with jetty OptionalSslConnectionFactory
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 71eb57ef893bc19cad5880996611d095d3a27325
Author: Alex Rudyy
AuthorDate: Mon Jun 14 21:47:02 2021 +0100
QPID-8520: [Broker-J] Substitute TlsOrPlainConnectionFactory with jetty
OptionalSslConnectionFactory
---
.../qpid/server/management/plugin/HttpManagement.java| 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 75ace26..239d269 100644
---
a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++
b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -30,7 +30,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -53,12 +52,14 @@ import com.google.common.base.Joiner;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
+import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.ssl.SslHandshakeListener;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.NetworkConnector;
+import org.eclipse.jetty.server.OptionalSslConnectionFactory;
import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
@@ -87,7 +88,6 @@ import
org.apache.qpid.server.management.plugin.filter.InteractiveAuthentication
import org.apache.qpid.server.management.plugin.filter.LoggingFilter;
import org.apache.qpid.server.management.plugin.filter.RedirectFilter;
import
org.apache.qpid.server.management.plugin.filter.RewriteRequestForUncompressedJavascript;
-import
org.apache.qpid.server.management.plugin.portunification.TlsOrPlainConnectionFactory;
import org.apache.qpid.server.management.plugin.servlet.FileServlet;
import org.apache.qpid.server.management.plugin.servlet.RootServlet;
import org.apache.qpid.server.management.plugin.servlet.ContentServlet;
@@ -574,15 +574,11 @@ public class HttpManagement extends
AbstractPluginAdapter implem
else if (transports.contains(Transport.SSL))
{
sslContextFactory = createSslContextFactory(port);
-ConnectionFactory sslConnectionFactory;
+ConnectionFactory sslConnectionFactory =
+new SslConnectionFactory(sslContextFactory,
httpConnectionFactory.getProtocol());
if (port.getTransports().contains(Transport.TCP))
{
-sslConnectionFactory =
-new TlsOrPlainConnectionFactory(sslContextFactory,
httpConnectionFactory.getProtocol());
-}
-else
-{
-sslConnectionFactory = new
SslConnectionFactory(sslContextFactory, httpConnectionFactory.getProtocol());
+sslConnectionFactory = new
OptionalSslConnectionFactory((SslConnectionFactory)sslConnectionFactory,
HttpVersion.HTTP_1_1.asString());
}
connectionFactories = new
ConnectionFactory[]{sslConnectionFactory, httpConnectionFactory};
}
@@ -1072,7 +1068,7 @@ public class HttpManagement extends
AbstractPluginAdapter implem
private static class ConnectionTrackingListener implements
Connection.Listener
{
-private final Map> _closeFutures =
new HashMap<>();
+private final Map> _closeFutures =
new ConcurrentHashMap<>();
@Override
public void onOpened(final Connection connection)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/03: NO-JIRA: Fix sporadic test failure
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit e55fda01b87eb093a326ec5d9a905cd214488b0f
Author: Alex Rudyy
AuthorDate: Mon Jun 14 20:00:47 2021 +0100
NO-JIRA: Fix sporadic test failure
---
.../authentication/PreemptiveAuthenticationTest.java | 20 ++--
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
index 14db61d..12e5483 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
@@ -32,6 +32,7 @@ import static org.hamcrest.Matchers.startsWith;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
+import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.SocketException;
@@ -146,27 +147,10 @@ public class PreemptiveAuthenticationTest extends
HttpTestBase
helper.getJson("broker/getUser", STRING_TYPE_REF, SC_OK);
fail("Exception not thrown");
}
-catch (SSLHandshakeException e)
+catch (IOException e)
{
// PASS
}
-catch (SSLException e)
-{
-// PASS
-//
-// TLS 1.3 seems has an issue with handshake (some sort of race):
-// after the socket being closed on server side due to unknown
certificate,
-// the client is trying to flush output stream and gets "broken
pipe".
-//
-// The issue seems related to
https://bugs.openjdk.java.net/browse/JDK-8207009
-// There is still a problem with handshake in 11.0.4 and above
-//
-// Ignoring this issue... due to low impact of the issue on client
applications...
-}
-catch (SocketException e)
-{
-// TODO - defect - we are not always seeing the SSL handshake
exception
-}
}
@Test
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch main updated (321abf3 -> 9b396b4)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from 321abf3 NO-JIRA: alternative approach to only using the repo for bdb dep where really needed, to speed up build new e55fda0 NO-JIRA: Fix sporadic test failure new 71eb57e QPID-8520: [Broker-J] Substitute TlsOrPlainConnectionFactory with jetty OptionalSslConnectionFactory new 9b396b4 QPID-8520: [Broker-J] Remove Qpid port-unification support for Jetty The 3 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: .../server/management/plugin/HttpManagement.java | 16 +- .../plugin/portunification/MarkableEndPoint.java | 275 --- .../TlsOrPlainConnectionFactory.java | 375 - .../TlsOrPlainConnectionFactoryTest.java | 196 --- .../PreemptiveAuthenticationTest.java | 20 +- 5 files changed, 8 insertions(+), 874 deletions(-) delete mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/MarkableEndPoint.java delete mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactory.java delete mode 100644 broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] branch 8.0.x updated: QPID-8483: [Broker-J] Report peer session name as part of 0-10 session subject
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 2b1a714 QPID-8483: [Broker-J] Report peer session name as part of
0-10 session subject
2b1a714 is described below
commit 2b1a714caef3bcbf1492962cb298c4ca3372082d
Author: Alex Rudyy
AuthorDate: Wed Dec 2 23:46:32 2020 +
QPID-8483: [Broker-J] Report peer session name as part of 0-10 session
subject
---
.../qpid/server/logging/AbstractMessageLogger.java | 15 +--
.../server/logging/subjects/ChannelLogSubject.java | 14 ++
.../qpid/server/session/AbstractAMQPSession.java| 10 +++---
.../logging/subjects/ChannelLogSubjectTest.java | 12 +---
.../qpid/server/protocol/v0_10/ServerSession.java | 17 +
.../qpid/server/protocol/v0_10/Session_0_10.java| 12 +++-
.../qpid/server/protocol/v0_8/AMQChannel.java | 2 +-
.../qpid/server/protocol/v1_0/Session_1_0.java | 21 +++--
8 files changed, 23 insertions(+), 80 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
b/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
index 215883c..e511920 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractMessageLogger.java
@@ -21,7 +21,6 @@
package org.apache.qpid.server.logging;
-import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.CHANNEL_FORMAT;
import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.CONNECTION_FORMAT;
import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.SOCKET_FORMAT;
import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.USER_FORMAT;
@@ -219,19 +218,7 @@ public abstract class AbstractMessageLogger implements
MessageLogger
private static String generateSessionActor(final AMQPSession session)
{
-AMQPConnection connection = session.getAMQPConnection();
-return "[" + MessageFormat.format(CHANNEL_FORMAT, connection == null ?
-1L : connection.getConnectionId(),
- (connection == null ||
connection.getAuthorizedPrincipal() == null)
- ? "?"
- :
connection.getAuthorizedPrincipal().getName(),
- (connection == null ||
connection.getRemoteAddressString() == null)
- ? "?"
- :
connection.getRemoteAddressString(),
- (connection == null ||
connection.getAddressSpaceName() == null)
- ? "?"
- :
connection.getAddressSpaceName(),
- session.getChannelId())
- + "] ";
+return session.getLogSubject().toLogString();
}
private static P getPrincipal(Subject subject,
Class clazz)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
b/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
index f0d1369..c41ae7d 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -22,19 +21,11 @@ package org.apache.qpid.server.logging.subjects;
import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.CHANNEL_FORMAT;
-import org.apache.qpid.server.session.AMQPSession;
import org.apache.qpid.server.transport.AMQPConnection;
public class ChannelLogSubject extends AbstractLogSubject
{
-private final AMQPSession _sessionModel;
-public ChannelLogSubject(AMQPSession session)
-{
-_sessionModel = session;
-updateSessionDetails();
-}
-
-public void updateSessionDetails()
+public ChannelLogSubject(AMQPConnection connection, Object channelId)
{
/**
* LOG FORMAT used by the AMQPConnectorActor follows
@@ -49,12 +40,11 @@ public class ChannelLogSubject extends AbstractLogSubject
* 3 - Virtualhost
* 4 - Channel ID
*/
-AMQPConnection connection = _sessionModel.getAMQPConnection
[qpid-broker-j] branch 8.0.x updated: QPID-8515: [Broker-J] Add missing operational logs
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git The following commit(s) were added to refs/heads/8.0.x by this push: new d88ae57 QPID-8515: [Broker-J] Add missing operational logs d88ae57 is described below commit d88ae57fd3b1fcfecb8f148f21ec066eb3ca4a44 Author: Alex Rudyy AuthorDate: Sat May 29 18:04:32 2021 +0100 QPID-8515: [Broker-J] Add missing operational logs This closes #85 --- .../berkeleydb/BDBHAVirtualHostNodeImpl.java | 36 +++- .../qpid/server/exchange/AbstractExchange.java | 54 +- .../qpid/server/logging/AbstractMessageLogger.java | 28 ++- .../qpid/server/logging/CreateLogMessage.java | 56 ++ .../qpid/server/logging/DeleteLogMessage.java | 52 + .../org/apache/qpid/server/logging/LogMessage.java | 6 + .../QueueLogSubject.java => Outcome.java} | 18 +- .../qpid/server/logging/UpdateLogMessage.java | 55 ++ .../logging/messages/AccessControlMessages.java| 62 ++ .../messages/AccessControl_logmessages.properties | 4 + .../messages/AuthenticationProviderMessages.java | 62 ++ .../AuthenticationProvider_logmessages.properties | 5 + .../server/logging/messages/ExchangeMessages.java | 62 ++ .../messages/Exchange_logmessages.properties | 5 + .../logging/messages/HighAvailabilityMessages.java | 62 ++ .../HighAvailability_logmessages.properties| 5 + .../server/logging/messages/KeyStoreMessages.java | 62 ++ .../messages/KeyStore_logmessages.properties | 4 + .../qpid/server/logging/messages/PortMessages.java | 62 ++ .../logging/messages/Port_logmessages.properties | 5 + .../server/logging/messages/QueueMessages.java | 62 ++ .../logging/messages/Queue_logmessages.properties | 5 + .../logging/messages/TrustStoreMessages.java | 64 ++- .../messages/TrustStore_logmessages.properties | 7 +- .../logging/messages/VirtualHostMessages.java | 124 .../messages/VirtualHost_logmessages.properties| 9 + .../server/logging/subjects/QueueLogSubject.java | 10 +- .../server/model/AbstractConfiguredObject.java | 210 +++-- .../apache/qpid/server/model/VirtualHostNode.java | 4 +- .../qpid/server/model/port/AbstractPort.java | 54 +- .../apache/qpid/server/queue/AbstractQueue.java| 59 +- .../qpid/server/queue/QueueConsumerImpl.java | 25 ++- .../qpid/server/security/AbstractKeyStore.java | 53 +- .../qpid/server/security/AbstractTrustStore.java | 52 - .../AutoGeneratedSelfSignedKeyStoreImpl.java | 8 - .../access/AbstractAccessControlProvider.java | 56 +- .../manager/AbstractAuthenticationManager.java | 62 -- .../qpid/server/session/AbstractAMQPSession.java | 26 +++ .../server/transport/AbstractAMQPConnection.java | 16 +- .../server/virtualhost/AbstractVirtualHost.java| 44 - .../virtualhostnode/AbstractVirtualHostNode.java | 3 +- .../RedirectingVirtualHostNodeImpl.java| 6 + .../logging/subjects/QueueLogSubjectTest.java | 2 +- .../apache/qpid/server/model/VirtualHostTest.java | 4 +- .../testmodels/hierarchy/TestAbstractCarImpl.java | 11 +- .../server/model/testmodels/hierarchy/TestCar.java | 3 +- .../virtualhost/AbstractVirtualHostTest.java | 2 + .../management/plugin/ManagementException.java | 4 +- .../endtoend/logging/VirtualHostLoggerTest.java| 2 +- 49 files changed, 1576 insertions(+), 116 deletions(-) diff --git a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java index ff9015f..b5ec316 100644 --- a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java +++ b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java @@ -62,6 +62,8 @@ import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.updater.Task; +import org.apache.qpid.server.logging.LogMessage; +import org.apache.qpid.server.logging.Outcome; import org.apache.qpid.server.logging.messages.BrokerMessages; import org.apache.qpid.server.logging.messages.ConfigStoreMessages; import org.apache.qpid.server.logging.messages.HighAvailabilityMessages; @@ -300,7 +302,6 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode permittedNodes = new ArrayList<>(getPermittedNodesFromHelper()); setAttributes(Collections.singletonMap(PERMITTED_NODES, permittedNodes)); } -getEventLogger().message(getVirtualHostNodeL
[qpid-broker-j] branch 8.0.x updated: QPID-8514: [Broker-J] Delete next available entry if the least significant entry is acquired by the consumer
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 0a1c200 QPID-8514: [Broker-J] Delete next available entry if the
least significant entry is acquired by the consumer
0a1c200 is described below
commit 0a1c200a763ea190f1471b69b6cd5abf42100249
Author: Alex Rudyy
AuthorDate: Sun Apr 25 15:20:14 2021 +0100
QPID-8514: [Broker-J] Delete next available entry if the least significant
entry is acquired by the consumer
---
.../qpid/server/queue/AbstractQueueEntryList.java | 1 +
.../server/queue/RingOverflowPolicyHandler.java| 65 +--
.../queue/RingOverflowPolicyHandlerTest.java | 25 ++-
.../qpid/server/queue/RingOverflowPolicyTest.java | 213 +
4 files changed, 282 insertions(+), 22 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
index 7c110f8..bbae28a 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
@@ -81,6 +81,7 @@ abstract class AbstractQueueEntryList implements
QueueEntryList
{
case AVAILABLE:
queueStatistics.addToAvailable(sizeWithHeader);
+_queue.checkCapacity();
break;
case ACQUIRED:
if(isConsumerAcquired && !wasConsumerAcquired)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/queue/RingOverflowPolicyHandler.java
b/broker-core/src/main/java/org/apache/qpid/server/queue/RingOverflowPolicyHandler.java
index 7a43dab..c64f875 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/queue/RingOverflowPolicyHandler.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/queue/RingOverflowPolicyHandler.java
@@ -19,13 +19,20 @@
package org.apache.qpid.server.queue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.QueueMessages;
import org.apache.qpid.server.model.OverflowPolicy;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.txn.AsyncAutoCommitTransaction;
+import org.apache.qpid.server.txn.ServerTransaction;
public class RingOverflowPolicyHandler implements OverflowPolicyHandler
{
+private static final Logger LOGGER =
LoggerFactory.getLogger(RingOverflowPolicyHandler.class);
private final Handler _handler;
RingOverflowPolicyHandler(final Queue queue,
@@ -38,7 +45,7 @@ public class RingOverflowPolicyHandler implements
OverflowPolicyHandler
@Override
public void checkOverflow(final QueueEntry newlyEnqueued)
{
-_handler.checkOverflow();
+_handler.checkOverflow(newlyEnqueued);
}
private static class Handler extends
OverflowPolicyMaximumQueueDepthChangeListener
@@ -57,10 +64,10 @@ public class RingOverflowPolicyHandler implements
OverflowPolicyHandler
@Override
void onMaximumQueueDepthChange(final Queue queue)
{
-checkOverflow();
+checkOverflow(null);
}
-private void checkOverflow()
+private void checkOverflow(final QueueEntry newlyEnqueued)
{
// When this method causes an entry to be deleted, the size of the
queue is changed, leading to
// checkOverflow being called again (because for other policies
this may trigger relaxation of flow control,
@@ -78,6 +85,7 @@ public class RingOverflowPolicyHandler implements
OverflowPolicyHandler
int counter = 0;
int queueDepthMessages;
long queueDepthBytes;
+QueueEntry lastSeenEntry = null;
do
{
queueDepthMessages = _queue.getQueueDepthMessages();
@@ -94,22 +102,26 @@ public class RingOverflowPolicyHandler implements
OverflowPolicyHandler
overflow = true;
}
-QueueEntry entry =
_queue.getLeastSignificantOldestEntry();
-
-if (entry != null)
-{
-counter++;
-_queue.deleteEntry(entry);
-}
-else
+lastSeenEntry = lastSeenEntry == null
+? _queue.getLeastSignificantOldestEntry()
+: lastSeenEntry.getNextVa
[qpid-broker-j] branch 8.0.x updated: QPID-8529:[Broker-J] Make sure that subject is set for all http requests
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 5c1b562 QPID-8529:[Broker-J] Make sure that subject is set for all
http requests
5c1b562 is described below
commit 5c1b5626ec2a53243bbfe84b560370fbc7475902
Author: Dedeepya T
AuthorDate: Tue Jun 1 20:24:45 2021 +0530
QPID-8529:[Broker-J] Make sure that subject is set for all http requests
This closes #89
---
.../auth/manager/AuthenticationResultCacher.java | 34 --
.../manager/AuthenticationResultCacherTest.java| 13 +
.../filter/InteractiveAuthenticationFilter.java| 27 -
3 files changed, 58 insertions(+), 16 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
index b18147d..70adba8 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
@@ -115,23 +115,27 @@ public class AuthenticationResultCacher
MessageDigest md = MessageDigest.getInstance("SHA-256");
Subject subject =
Subject.getSubject(AccessController.getContext());
-Set connectionPrincipals =
subject.getPrincipals(SocketConnectionPrincipal.class);
-if (connectionPrincipals != null &&
!connectionPrincipals.isEmpty())
+if (subject != null)
{
-SocketConnectionPrincipal connectionPrincipal =
connectionPrincipals.iterator().next();
-SocketAddress remoteAddress =
connectionPrincipal.getRemoteAddress();
-String address;
-if (remoteAddress instanceof InetSocketAddress)
+Set connectionPrincipals =
+subject.getPrincipals(SocketConnectionPrincipal.class);
+if (!connectionPrincipals.isEmpty())
{
-address = ((InetSocketAddress)
remoteAddress).getHostString();
-}
-else
-{
-address = remoteAddress.toString();
-}
-if (address != null)
-{
-md.update(address.getBytes(UTF8));
+SocketConnectionPrincipal connectionPrincipal =
connectionPrincipals.iterator().next();
+SocketAddress remoteAddress =
connectionPrincipal.getRemoteAddress();
+String address;
+if (remoteAddress instanceof InetSocketAddress)
+{
+address = ((InetSocketAddress)
remoteAddress).getHostString();
+}
+else
+{
+address = remoteAddress.toString();
+}
+if (address != null)
+{
+md.update(address.getBytes(UTF8));
+}
}
}
diff --git
a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacherTest.java
b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacherTest.java
index 659fc91..82ac4f6 100644
---
a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacherTest.java
+++
b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacherTest.java
@@ -135,6 +135,19 @@ public class AuthenticationResultCacherTest extends
UnitTestBase
assertGetOrLoad(credentials, expectedResult, expectedHitCount);
}
+@Test
+public void testCacheHitNoSubject()
+{
+final String credentials = "credentials";
+final AuthenticationResult result1 =
_authenticationResultCacher.getOrLoad(new String[]{credentials}, _loader);
+assertEquals("Unexpected AuthenticationResult",
_successfulAuthenticationResult, result1);
+assertEquals("Unexpected number of loads before cache hit", 1,
_loadCallCount);
+
+final AuthenticationResult result2 =
_authenticationResultCacher.getOrLoad(new String[]{credentials}, _loader);
+assertEquals("Unexpected AuthenticationResult",
_successfulAuthenticationResult, result2);
+assertEquals("Unexpected number of loads before cache hit", 1,
_loadCallCount);
+}
+
private void assertGetOrLoad(final String credentials,
final AuthenticationResult expectedResult,
[qpid-broker-j] branch 8.0.x updated (ec80fae -> f10cbb6)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from ec80fae NO-JIRA: Fix maven execution settings in conversion tests new 505546a QPID-8535:[Broker-J]Add flag to ignore invlaid SNI header new f10cbb6 QPID-8535:[Broker-J] Fix attribute name for 'ignoreInvalidSni' and make it derived attribute The 2 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: .../apache/qpid/server/model/port/AmqpPort.java| 9 + .../qpid/server/model/port/AmqpPortImpl.java | 9 + .../NonBlockingConnectionTLSDelegate.java | 29 +-- .../org/apache/qpid/server/transport/SNITest.java | 42 +++--- ...nectionPrincipalStatisticsRegistryImplTest.java | 2 ++ 5 files changed, 76 insertions(+), 15 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8535:[Broker-J] Fix attribute name for 'ignoreInvalidSni' and make it derived attribute
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit f10cbb6b7e426b8c2165aa8fe35a4badc6105954
Author: Alex Rudyy
AuthorDate: Sun Jun 13 21:51:13 2021 +0100
QPID-8535:[Broker-J] Fix attribute name for 'ignoreInvalidSni' and make it
derived attribute
---
.../src/main/java/org/apache/qpid/server/model/port/AmqpPort.java | 4 ++--
.../main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java | 8
.../qpid/server/transport/NonBlockingConnectionTLSDelegate.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
index 68f5683..c2b2e3d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
@@ -165,8 +165,8 @@ public interface AmqpPort> extends
Port
@ManagedAttribute( defaultValue = "${" + PORT_MAX_OPEN_CONNECTIONS + "}" )
int getMaxOpenConnections();
-@ManagedAttribute( defaultValue = "${" + PORT_IGNORE_INVALID_SNI + "}" )
-boolean getIgnoreInvalidSni();
+@DerivedAttribute
+boolean isIgnoreInvalidSni();
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units =
StatisticUnit.COUNT,
label = "Open Connections",
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
index bd7981a..a3b8156 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
@@ -86,9 +86,6 @@ public class AmqpPortImpl extends AbstractPort
implements AmqpPort
private int _maxOpenConnections;
@ManagedAttributeField
-private boolean _ignoreInvalidSni;
-
-@ManagedAttributeField
private int _threadPoolSize;
@ManagedAttributeField
@@ -112,6 +109,8 @@ public class AmqpPortImpl extends
AbstractPort implements AmqpPort
private volatile int _tlsSessionTimeout;
private volatile int _tlsSessionCacheSize;
private volatile List
_connectionPropertyEnrichers;
+private volatile boolean _ignoreInvalidSni;
+
@ManagedObjectFactoryConstructor
public AmqpPortImpl(Map attributes, Container container)
@@ -152,7 +151,7 @@ public class AmqpPortImpl extends
AbstractPort implements AmqpPort
}
@Override
-public boolean getIgnoreInvalidSni()
+public boolean isIgnoreInvalidSni()
{
return _ignoreInvalidSni;
}
@@ -202,6 +201,7 @@ public class AmqpPortImpl extends
AbstractPort implements AmqpPort
_heartBeatDelay = getContextValue(Integer.class,
AmqpPort.HEART_BEAT_DELAY);
_tlsSessionTimeout = getContextValue(Integer.class,
AmqpPort.TLS_SESSION_TIMEOUT);
_tlsSessionCacheSize = getContextValue(Integer.class,
AmqpPort.TLS_SESSION_CACHE_SIZE);
+_ignoreInvalidSni = getContextValue(Boolean.class,
AmqpPort.PORT_IGNORE_INVALID_SNI);
@SuppressWarnings("unchecked")
List configurationPropertyEnrichers =
getContextValue(List.class, AmqpPort.CONNECTION_PROPERTY_ENRICHERS);
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
index d40e1a8..2a9f288 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
@@ -81,7 +81,7 @@ public class NonBlockingConnectionTLSDelegate implements
NonBlockingConnectionDe
_netInputBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
_applicationBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
_netOutputBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
-_ignoreInvalidSni = port.getIgnoreInvalidSni();
+_ignoreInvalidSni = port.isIgnoreInvalidSni();
}
@Override
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8535:[Broker-J]Add flag to ignore invlaid SNI header
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 505546a96bbeb956d21f9ed4c0b1142f6014ada6
Author: Dedeepya T
AuthorDate: Tue Jun 8 19:29:58 2021 +0530
QPID-8535:[Broker-J]Add flag to ignore invlaid SNI header
This closes #91
---
.../apache/qpid/server/model/port/AmqpPort.java| 9 +
.../qpid/server/model/port/AmqpPortImpl.java | 9 +
.../NonBlockingConnectionTLSDelegate.java | 29 +--
.../org/apache/qpid/server/transport/SNITest.java | 42 +++---
...nectionPrincipalStatisticsRegistryImplTest.java | 2 ++
5 files changed, 76 insertions(+), 15 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
index 530d603..68f5683 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
@@ -64,6 +64,12 @@ public interface AmqpPort> extends
Port
@ManagedContextDefault(name = PORT_MAX_OPEN_CONNECTIONS)
int DEFAULT_MAX_OPEN_CONNECTIONS = -1;
+String PORT_IGNORE_INVALID_SNI = "qpid.port.amqp.ignoreInvalidSni";
+
+@SuppressWarnings("unused")
+@ManagedContextDefault(name = PORT_IGNORE_INVALID_SNI)
+boolean DEFAULT_PORT_IGNORE_INVALID_SNI = false;
+
@SuppressWarnings("unused")
@ManagedContextDefault( name = PORT_AMQP_THREAD_POOL_SIZE)
long DEFAULT_PORT_AMQP_THREAD_POOL_SIZE = 8;
@@ -159,6 +165,9 @@ public interface AmqpPort> extends
Port
@ManagedAttribute( defaultValue = "${" + PORT_MAX_OPEN_CONNECTIONS + "}" )
int getMaxOpenConnections();
+@ManagedAttribute( defaultValue = "${" + PORT_IGNORE_INVALID_SNI + "}" )
+boolean getIgnoreInvalidSni();
+
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units =
StatisticUnit.COUNT,
label = "Open Connections",
description = "Current number of connections made through this
port",
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
index 88fc19c..bd7981a 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
@@ -86,6 +86,9 @@ public class AmqpPortImpl extends AbstractPort
implements AmqpPort
private int _maxOpenConnections;
@ManagedAttributeField
+private boolean _ignoreInvalidSni;
+
+@ManagedAttributeField
private int _threadPoolSize;
@ManagedAttributeField
@@ -149,6 +152,12 @@ public class AmqpPortImpl extends
AbstractPort implements AmqpPort
}
@Override
+public boolean getIgnoreInvalidSni()
+{
+return _ignoreInvalidSni;
+}
+
+@Override
protected void onCreate()
{
super.onCreate();
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
index 7ecdaf9..d40e1a8 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class NonBlockingConnectionTLSDelegate implements
NonBlockingConnectionDelegate
@@ -61,6 +62,7 @@ public class NonBlockingConnectionTLSDelegate implements
NonBlockingConnectionDe
private QpidByteBuffer _netInputBuffer;
private QpidByteBuffer _netOutputBuffer;
private QpidByteBuffer _applicationBuffer;
+private final boolean _ignoreInvalidSni;
public NonBlockingConnectionTLSDelegate(NonBlockingConnection parent,
AmqpPort port)
@@ -79,6 +81,7 @@ public class NonBlockingConnectionTLSDelegate implements
NonBlockingConnectionDe
_netInputBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
_applicationBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
_netOutputBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
+_ignoreInvalidSni = port.getIgnoreInvalidSni();
}
@Override
@@ -97,12 +100,12 @@ public class N
[qpid-broker-j] 02/02: QPID-8535:[Broker-J] Fix attribute name for 'ignoreInvalidSni' and make it derived attribute
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit cc51a40b855819e7a0df6f818d9a928a03f11377
Author: Alex Rudyy
AuthorDate: Sun Jun 13 21:51:13 2021 +0100
QPID-8535:[Broker-J] Fix attribute name for 'ignoreInvalidSni' and make it
derived attribute
---
.../src/main/java/org/apache/qpid/server/model/port/AmqpPort.java | 4 ++--
.../main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java | 8
.../qpid/server/transport/NonBlockingConnectionTLSDelegate.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
index 68f5683..c2b2e3d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
@@ -165,8 +165,8 @@ public interface AmqpPort> extends
Port
@ManagedAttribute( defaultValue = "${" + PORT_MAX_OPEN_CONNECTIONS + "}" )
int getMaxOpenConnections();
-@ManagedAttribute( defaultValue = "${" + PORT_IGNORE_INVALID_SNI + "}" )
-boolean getIgnoreInvalidSni();
+@DerivedAttribute
+boolean isIgnoreInvalidSni();
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units =
StatisticUnit.COUNT,
label = "Open Connections",
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
index bd7981a..a3b8156 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
@@ -86,9 +86,6 @@ public class AmqpPortImpl extends AbstractPort
implements AmqpPort
private int _maxOpenConnections;
@ManagedAttributeField
-private boolean _ignoreInvalidSni;
-
-@ManagedAttributeField
private int _threadPoolSize;
@ManagedAttributeField
@@ -112,6 +109,8 @@ public class AmqpPortImpl extends
AbstractPort implements AmqpPort
private volatile int _tlsSessionTimeout;
private volatile int _tlsSessionCacheSize;
private volatile List
_connectionPropertyEnrichers;
+private volatile boolean _ignoreInvalidSni;
+
@ManagedObjectFactoryConstructor
public AmqpPortImpl(Map attributes, Container container)
@@ -152,7 +151,7 @@ public class AmqpPortImpl extends
AbstractPort implements AmqpPort
}
@Override
-public boolean getIgnoreInvalidSni()
+public boolean isIgnoreInvalidSni()
{
return _ignoreInvalidSni;
}
@@ -202,6 +201,7 @@ public class AmqpPortImpl extends
AbstractPort implements AmqpPort
_heartBeatDelay = getContextValue(Integer.class,
AmqpPort.HEART_BEAT_DELAY);
_tlsSessionTimeout = getContextValue(Integer.class,
AmqpPort.TLS_SESSION_TIMEOUT);
_tlsSessionCacheSize = getContextValue(Integer.class,
AmqpPort.TLS_SESSION_CACHE_SIZE);
+_ignoreInvalidSni = getContextValue(Boolean.class,
AmqpPort.PORT_IGNORE_INVALID_SNI);
@SuppressWarnings("unchecked")
List configurationPropertyEnrichers =
getContextValue(List.class, AmqpPort.CONNECTION_PROPERTY_ENRICHERS);
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
index b646d10..869775e 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
@@ -81,7 +81,7 @@ public class NonBlockingConnectionTLSDelegate implements
NonBlockingConnectionDe
_netInputBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
_applicationBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
_netOutputBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
-_ignoreInvalidSni = port.getIgnoreInvalidSni();
+_ignoreInvalidSni = port.isIgnoreInvalidSni();
}
@Override
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8535:[Broker-J]Add flag to ignore invlaid SNI header
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 0dff63caf991dfa72fcb4d2989a9427490228a08
Author: Dedeepya T
AuthorDate: Tue Jun 8 19:29:58 2021 +0530
QPID-8535:[Broker-J]Add flag to ignore invlaid SNI header
This closes #91
---
.../apache/qpid/server/model/port/AmqpPort.java| 9 +
.../qpid/server/model/port/AmqpPortImpl.java | 9 +
.../NonBlockingConnectionTLSDelegate.java | 29 +--
.../org/apache/qpid/server/transport/SNITest.java | 42 +++---
...nectionPrincipalStatisticsRegistryImplTest.java | 2 ++
5 files changed, 76 insertions(+), 15 deletions(-)
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
index 530d603..68f5683 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
@@ -64,6 +64,12 @@ public interface AmqpPort> extends
Port
@ManagedContextDefault(name = PORT_MAX_OPEN_CONNECTIONS)
int DEFAULT_MAX_OPEN_CONNECTIONS = -1;
+String PORT_IGNORE_INVALID_SNI = "qpid.port.amqp.ignoreInvalidSni";
+
+@SuppressWarnings("unused")
+@ManagedContextDefault(name = PORT_IGNORE_INVALID_SNI)
+boolean DEFAULT_PORT_IGNORE_INVALID_SNI = false;
+
@SuppressWarnings("unused")
@ManagedContextDefault( name = PORT_AMQP_THREAD_POOL_SIZE)
long DEFAULT_PORT_AMQP_THREAD_POOL_SIZE = 8;
@@ -159,6 +165,9 @@ public interface AmqpPort> extends
Port
@ManagedAttribute( defaultValue = "${" + PORT_MAX_OPEN_CONNECTIONS + "}" )
int getMaxOpenConnections();
+@ManagedAttribute( defaultValue = "${" + PORT_IGNORE_INVALID_SNI + "}" )
+boolean getIgnoreInvalidSni();
+
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units =
StatisticUnit.COUNT,
label = "Open Connections",
description = "Current number of connections made through this
port",
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
index 88fc19c..bd7981a 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
@@ -86,6 +86,9 @@ public class AmqpPortImpl extends AbstractPort
implements AmqpPort
private int _maxOpenConnections;
@ManagedAttributeField
+private boolean _ignoreInvalidSni;
+
+@ManagedAttributeField
private int _threadPoolSize;
@ManagedAttributeField
@@ -149,6 +152,12 @@ public class AmqpPortImpl extends
AbstractPort implements AmqpPort
}
@Override
+public boolean getIgnoreInvalidSni()
+{
+return _ignoreInvalidSni;
+}
+
+@Override
protected void onCreate()
{
super.onCreate();
diff --git
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
index a463af0..b646d10 100644
---
a/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
+++
b/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class NonBlockingConnectionTLSDelegate implements
NonBlockingConnectionDelegate
@@ -61,6 +62,7 @@ public class NonBlockingConnectionTLSDelegate implements
NonBlockingConnectionDe
private QpidByteBuffer _netInputBuffer;
private QpidByteBuffer _netOutputBuffer;
private QpidByteBuffer _applicationBuffer;
+private final boolean _ignoreInvalidSni;
public NonBlockingConnectionTLSDelegate(NonBlockingConnection parent,
AmqpPort port)
@@ -79,6 +81,7 @@ public class NonBlockingConnectionTLSDelegate implements
NonBlockingConnectionDe
_netInputBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
_applicationBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
_netOutputBuffer = QpidByteBuffer.allocateDirect(_networkBufferSize);
+_ignoreInvalidSni = port.getIgnoreInvalidSni();
}
@Override
@@ -97,12 +100,12 @@ public class N
[qpid-broker-j] branch main updated (baaad4f -> cc51a40)
This is an automated email from the ASF dual-hosted git repository. orudyy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git. from baaad4f QPID-8530: [Broker-J] Duplicated functionality of the Selector::wakeup method in SelectorThread new 0dff63c QPID-8535:[Broker-J]Add flag to ignore invlaid SNI header new cc51a40 QPID-8535:[Broker-J] Fix attribute name for 'ignoreInvalidSni' and make it derived attribute The 2 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: .../apache/qpid/server/model/port/AmqpPort.java| 9 + .../qpid/server/model/port/AmqpPortImpl.java | 9 + .../NonBlockingConnectionTLSDelegate.java | 29 +-- .../org/apache/qpid/server/transport/SNITest.java | 42 +++--- ...nectionPrincipalStatisticsRegistryImplTest.java | 2 ++ 5 files changed, 76 insertions(+), 15 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
