You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2025/05/19 14:02:03 UTC
(camel) branch main updated: CAMEL-22083: Artemis (#18113)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new e48b265a604 CAMEL-22083: Artemis (#18113)
e48b265a604 is described below
commit e48b265a604846c2dd0af186d0a3fb267dec27ad
Author: Federico Mariani <34...@users.noreply.github.com>
AuthorDate: Mon May 19 16:01:57 2025 +0200
CAMEL-22083: Artemis (#18113)
---
.../apache/camel/catalog/test-infra/metadata.json | 27 ----------------------
.../src/generated/resources/META-INF/metadata.json | 27 ----------------------
.../artemis/services/ArtemisAMQPInfraService.java | 5 ++++
.../artemis/services/ArtemisInfraService.java | 4 ++++
.../artemis/services/ArtemisMQTTInfraService.java | 9 ++++----
.../services/ArtemisPersistentVMInfraService.java | 4 ----
.../artemis/services/ArtemisVMInfraService.java | 4 ----
7 files changed, 14 insertions(+), 66 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json
index 6ae17303bd6..c3ab636a89b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json
@@ -295,15 +295,6 @@
"groupId" : "org.apache.camel",
"artifactId" : "camel-test-infra-couchdb",
"version" : "4.12.0-SNAPSHOT"
-}, {
- "service" : "org.apache.camel.test.infra.artemis.services.ArtemisInfraService",
- "description" : "Apache Artemis is an open source message broker",
- "implementation" : "org.apache.camel.test.infra.artemis.services.ArtemisVMInfraService",
- "alias" : [ "artemis" ],
- "aliasImplementation" : [ ],
- "groupId" : "org.apache.camel",
- "artifactId" : "camel-test-infra-artemis",
- "version" : "4.12.0-SNAPSHOT"
}, {
"service" : "org.apache.camel.test.infra.hivemq.services.HiveMQInfraService",
"description" : "MQTT Platform HiveMQ",
@@ -349,15 +340,6 @@
"groupId" : "org.apache.camel",
"artifactId" : "camel-test-infra-openldap",
"version" : "4.12.0-SNAPSHOT"
-}, {
- "service" : "org.apache.camel.test.infra.artemis.services.ArtemisInfraService",
- "description" : "Apache Artemis is an open source message broker",
- "implementation" : "org.apache.camel.test.infra.artemis.services.ArtemisPersistentVMInfraService",
- "alias" : [ "artemis" ],
- "aliasImplementation" : [ "persistent" ],
- "groupId" : "org.apache.camel",
- "artifactId" : "camel-test-infra-artemis",
- "version" : "4.12.0-SNAPSHOT"
}, {
"service" : "org.apache.camel.test.infra.xmpp.services.XmppInfraService",
"description" : "Test XMPP Server",
@@ -367,15 +349,6 @@
"groupId" : "org.apache.camel",
"artifactId" : "camel-test-infra-xmpp",
"version" : "4.12.0-SNAPSHOT"
-}, {
- "service" : "org.apache.camel.test.infra.artemis.services.ArtemisInfraService",
- "description" : "Apache Artemis is an open source message broker",
- "implementation" : "org.apache.camel.test.infra.artemis.services.ArtemisMQTTInfraService",
- "alias" : [ "artemis" ],
- "aliasImplementation" : [ "mqtt" ],
- "groupId" : "org.apache.camel",
- "artifactId" : "camel-test-infra-artemis",
- "version" : "4.12.0-SNAPSHOT"
}, {
"service" : "org.apache.camel.test.infra.pulsar.services.PulsarInfraService",
"description" : "Distributed messaging and streaming platform",
diff --git a/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json b/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json
index 6ae17303bd6..c3ab636a89b 100644
--- a/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json
+++ b/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json
@@ -295,15 +295,6 @@
"groupId" : "org.apache.camel",
"artifactId" : "camel-test-infra-couchdb",
"version" : "4.12.0-SNAPSHOT"
-}, {
- "service" : "org.apache.camel.test.infra.artemis.services.ArtemisInfraService",
- "description" : "Apache Artemis is an open source message broker",
- "implementation" : "org.apache.camel.test.infra.artemis.services.ArtemisVMInfraService",
- "alias" : [ "artemis" ],
- "aliasImplementation" : [ ],
- "groupId" : "org.apache.camel",
- "artifactId" : "camel-test-infra-artemis",
- "version" : "4.12.0-SNAPSHOT"
}, {
"service" : "org.apache.camel.test.infra.hivemq.services.HiveMQInfraService",
"description" : "MQTT Platform HiveMQ",
@@ -349,15 +340,6 @@
"groupId" : "org.apache.camel",
"artifactId" : "camel-test-infra-openldap",
"version" : "4.12.0-SNAPSHOT"
-}, {
- "service" : "org.apache.camel.test.infra.artemis.services.ArtemisInfraService",
- "description" : "Apache Artemis is an open source message broker",
- "implementation" : "org.apache.camel.test.infra.artemis.services.ArtemisPersistentVMInfraService",
- "alias" : [ "artemis" ],
- "aliasImplementation" : [ "persistent" ],
- "groupId" : "org.apache.camel",
- "artifactId" : "camel-test-infra-artemis",
- "version" : "4.12.0-SNAPSHOT"
}, {
"service" : "org.apache.camel.test.infra.xmpp.services.XmppInfraService",
"description" : "Test XMPP Server",
@@ -367,15 +349,6 @@
"groupId" : "org.apache.camel",
"artifactId" : "camel-test-infra-xmpp",
"version" : "4.12.0-SNAPSHOT"
-}, {
- "service" : "org.apache.camel.test.infra.artemis.services.ArtemisInfraService",
- "description" : "Apache Artemis is an open source message broker",
- "implementation" : "org.apache.camel.test.infra.artemis.services.ArtemisMQTTInfraService",
- "alias" : [ "artemis" ],
- "aliasImplementation" : [ "mqtt" ],
- "groupId" : "org.apache.camel",
- "artifactId" : "camel-test-infra-artemis",
- "version" : "4.12.0-SNAPSHOT"
}, {
"service" : "org.apache.camel.test.infra.pulsar.services.PulsarInfraService",
"description" : "Distributed messaging and streaming platform",
diff --git a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAMQPInfraService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAMQPInfraService.java
index 9cb57be143c..79107d9adc6 100644
--- a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAMQPInfraService.java
+++ b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAMQPInfraService.java
@@ -102,6 +102,11 @@ public class ArtemisAMQPInfraService extends AbstractArtemisEmbeddedService {
return brokerURL;
}
+ @Override
+ public String remoteURI() {
+ return "amqp://0.0.0.0:" + amqpPort;
+ }
+
@Override
public int brokerPort() {
return amqpPort;
diff --git a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisInfraService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisInfraService.java
index 2254d955bfb..efb2199bded 100644
--- a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisInfraService.java
+++ b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisInfraService.java
@@ -30,6 +30,10 @@ public interface ArtemisInfraService extends InfrastructureService {
int brokerPort();
+ default String remoteURI() {
+ throw new IllegalArgumentException("Remote URI is not supported");
+ }
+
default void registerProperties() {
// For compatibility with the previous format used by camel-sjms tests
System.setProperty(ArtemisProperties.SERVICE_ADDRESS, serviceAddress());
diff --git a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisMQTTInfraService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisMQTTInfraService.java
index 458b91ec011..8317b02e355 100644
--- a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisMQTTInfraService.java
+++ b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisMQTTInfraService.java
@@ -19,12 +19,8 @@ package org.apache.camel.test.infra.artemis.services;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
-import org.apache.camel.spi.annotations.InfraService;
import org.apache.camel.test.infra.artemis.common.ArtemisRunException;
-@InfraService(service = ArtemisInfraService.class,
- description = "Apache Artemis is an open source message broker",
- serviceAlias = "artemis", serviceImplementationAlias = "mqtt")
public class ArtemisMQTTInfraService extends AbstractArtemisEmbeddedService {
private String brokerURL;
@@ -64,6 +60,11 @@ public class ArtemisMQTTInfraService extends AbstractArtemisEmbeddedService {
return brokerURL;
}
+ @Override
+ public String remoteURI() {
+ return brokerURL;
+ }
+
@Override
public int brokerPort() {
return port;
diff --git a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisPersistentVMInfraService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisPersistentVMInfraService.java
index eba181205d5..8fdf1ceb310 100644
--- a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisPersistentVMInfraService.java
+++ b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisPersistentVMInfraService.java
@@ -21,12 +21,8 @@ import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
-import org.apache.camel.spi.annotations.InfraService;
import org.apache.camel.test.infra.artemis.common.ArtemisRunException;
-@InfraService(service = ArtemisInfraService.class,
- description = "Apache Artemis is an open source message broker",
- serviceAlias = "artemis", serviceImplementationAlias = "persistent")
public class ArtemisPersistentVMInfraService extends AbstractArtemisEmbeddedService {
private String brokerURL;
diff --git a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisVMInfraService.java b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisVMInfraService.java
index 2bbe09d4832..d28631ba4ff 100644
--- a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisVMInfraService.java
+++ b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisVMInfraService.java
@@ -20,14 +20,10 @@ import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
-import org.apache.camel.spi.annotations.InfraService;
import org.apache.camel.test.infra.artemis.common.ArtemisRunException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@InfraService(service = ArtemisInfraService.class,
- description = "Apache Artemis is an open source message broker",
- serviceAlias = "artemis")
public class ArtemisVMInfraService extends AbstractArtemisEmbeddedService {
private static final Logger LOG = LoggerFactory.getLogger(ArtemisVMInfraService.class);