You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/09/25 14:35:46 UTC
[1/2] activemq-artemis git commit: [ARTMIS-1431] Adapt transport
configuration in ClientProtocolManagerFactory
Repository: activemq-artemis
Updated Branches:
refs/heads/1.x eacaffe16 -> c85575f43
[ARTMIS-1431] Adapt transport configuration in ClientProtocolManagerFactory
add the adaptTransportConfiguration() method to the
ClientProtocolManagerFactory so that transport configurations used by
the ClientProtocolManager have an opportunity to adapt their transport
configuration.
This allows the HornetQClientProtocolManagerFactory to adapt the
transport configuration received by remote HornetQ broker to replace the
HornetQ-based NettyConnectorFactory by the Artemis-based one.
JIRA: https://issues.apache.org/jira/browse/ARTEMIS-1431
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/49202261
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/49202261
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/49202261
Branch: refs/heads/1.x
Commit: 492022618dfd7ef5410c564f4f23c33f0ba33ccb
Parents: eacaffe
Author: Jeff Mesnil <jm...@gmail.com>
Authored: Fri Sep 22 16:35:36 2017 +0200
Committer: Jeff Mesnil <jm...@gmail.com>
Committed: Fri Sep 22 16:35:36 2017 +0200
----------------------------------------------------------------------
.../core/client/impl/ServerLocatorImpl.java | 4 +++-
.../ActiveMQClientProtocolManagerFactory.java | 6 +++++
.../remoting/ClientProtocolManagerFactory.java | 10 +++++++++
.../HornetQClientProtocolManagerFactory.java | 23 ++++++++++++++++++++
...ctiveMQServerSideProtocolManagerFactory.java | 6 +++++
.../xa/recovery/XARecoveryConfig.java | 2 +-
6 files changed, 49 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/49202261/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index 1ea0cb3..fc9100c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -1500,7 +1500,9 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
int count = 0;
for (TopologyMemberImpl pair : membersCopy) {
- topologyArrayLocal[count++] = pair.getConnector();
+ Pair<TransportConfiguration, TransportConfiguration> transportConfigs = pair.getConnector();
+ topologyArrayLocal[count++] = new Pair<>(protocolManagerFactory.adaptTransportConfiguration(transportConfigs.getA()),
+ protocolManagerFactory.adaptTransportConfiguration(transportConfigs.getB()));
}
this.topologyArray = topologyArrayLocal;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/49202261/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java
index 5675fff..866713c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManagerFactory.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.core.protocol.core.impl;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager;
import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManagerFactory;
@@ -49,4 +50,9 @@ public class ActiveMQClientProtocolManagerFactory implements ClientProtocolManag
public ClientProtocolManager newProtocolManager() {
return new ActiveMQClientProtocolManager();
}
+
+ @Override
+ public TransportConfiguration adaptTransportConfiguration(TransportConfiguration tc) {
+ return tc;
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/49202261/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java
index 7e82238..96e9ead 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ClientProtocolManagerFactory.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.spi.core.remoting;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
public interface ClientProtocolManagerFactory {
@@ -25,4 +26,13 @@ public interface ClientProtocolManagerFactory {
void setLocator(ServerLocator locator);
ServerLocator getLocator();
+
+ /**
+ * Adapt the transport configuration passed in parameter and return an adapted one that is suitable to use with ClientProtocolManager
+ * created by this factory.
+ *
+ * @param tc the original TransportConfiguration
+ * @return the adapted TransportConfiguration
+ */
+ TransportConfiguration adaptTransportConfiguration(TransportConfiguration tc);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/49202261/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManagerFactory.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManagerFactory.java b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManagerFactory.java
index 99cfcb9..57f2c94 100644
--- a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManagerFactory.java
+++ b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManagerFactory.java
@@ -17,8 +17,10 @@
package org.apache.activemq.artemis.core.protocol.hornetq.client;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.core.protocol.hornetq.HQPropertiesConversionInterceptor;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager;
import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManagerFactory;
import org.osgi.service.component.annotations.Component;
@@ -40,6 +42,27 @@ public class HornetQClientProtocolManagerFactory implements ClientProtocolManage
locator.addOutgoingInterceptor(new HQPropertiesConversionInterceptor(false));
}
+ /**
+ * Adapt the transport configuration by replacing the factoryClassName corresponding to an HornetQ's NettyConnectorFactory
+ * by the Artemis-based implementation.
+ */
+ @Override
+ public TransportConfiguration adaptTransportConfiguration(TransportConfiguration tc) {
+ if (tc == null) {
+ return null;
+ }
+
+ String factoryClassName = tc.getFactoryClassName();
+ if (factoryClassName.equals("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory")) {
+ factoryClassName = NettyConnectorFactory.class.getName();
+ }
+ TransportConfiguration newConfig = new TransportConfiguration(factoryClassName,
+ tc.getParams(),
+ tc.getName(),
+ tc.getExtraParams());
+ return newConfig;
+ }
+
@Override
public ClientProtocolManager newProtocolManager() {
return new HornetQClientProtocolManager();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/49202261/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java
index 3c9791e..85ad3a3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ActiveMQServerSideProtocolManagerFactory.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.core.server.cluster;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.core.protocol.ServerPacketDecoder;
import org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQClientProtocolManager;
@@ -52,6 +53,11 @@ public class ActiveMQServerSideProtocolManagerFactory implements ClientProtocolM
private static final long serialVersionUID = 1;
@Override
+ public TransportConfiguration adaptTransportConfiguration(TransportConfiguration tc) {
+ return tc;
+ }
+
+ @Override
public ClientProtocolManager newProtocolManager() {
return new ActiveMQReplicationProtocolManager();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/49202261/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java
----------------------------------------------------------------------
diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java
index f2f7864..6336824 100644
--- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java
+++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/XARecoveryConfig.java
@@ -65,7 +65,7 @@ public class XARecoveryConfig {
final ClientProtocolManagerFactory clientProtocolManager) {
TransportConfiguration[] newTransportConfiguration = new TransportConfiguration[transportConfiguration.length];
for (int i = 0; i < transportConfiguration.length; i++) {
- newTransportConfiguration[i] = transportConfiguration[i].newTransportConfig("");
+ newTransportConfiguration[i] = clientProtocolManager.adaptTransportConfiguration(transportConfiguration[i].newTransportConfig(""));
}
this.transportConfiguration = newTransportConfiguration;
[2/2] activemq-artemis git commit: This closes #1547
Posted by cl...@apache.org.
This closes #1547
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c85575f4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c85575f4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c85575f4
Branch: refs/heads/1.x
Commit: c85575f43555617f1fd7160d86b9664d9471a110
Parents: eacaffe 4920226
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Sep 25 10:35:50 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Sep 25 10:35:50 2017 -0400
----------------------------------------------------------------------
.../core/client/impl/ServerLocatorImpl.java | 4 +++-
.../ActiveMQClientProtocolManagerFactory.java | 6 +++++
.../remoting/ClientProtocolManagerFactory.java | 10 +++++++++
.../HornetQClientProtocolManagerFactory.java | 23 ++++++++++++++++++++
...ctiveMQServerSideProtocolManagerFactory.java | 6 +++++
.../xa/recovery/XARecoveryConfig.java | 2 +-
6 files changed, 49 insertions(+), 2 deletions(-)
----------------------------------------------------------------------