Skip to content

Commit cc377ea

Browse files
Merge pull request #30 from SolaceCoEExt/fix-issues
Changed maven artifact coordinates and package names to com.solace.quarkus
2 parents c348e75 + 7fecd65 commit cc377ea

File tree

79 files changed

+278
-193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+278
-193
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Quarkus Solace
22

3-
[![Version](https://img.shields.io/maven-central/v/io.quarkiverse.solace/quarkus-solace?logo=apache-maven&style=flat-square)](https://search.maven.org/artifact/io.quarkiverse.solace/quarkus-solace)
3+
[![Version](https://img.shields.io/maven-central/v/com.solace.quarkus/quarkus-solace?logo=apache-maven&style=flat-square)](https://search.maven.org/artifact/com.solace.quarkus/quarkus-solace)
44

55
## About Solace Quarkus Extension
66

deployment/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
6-
<groupId>io.quarkiverse.solace</groupId>
6+
<groupId>com.solace.quarkus</groupId>
77
<artifactId>quarkus-solace-parent</artifactId>
88
<version>999-SNAPSHOT</version>
99
</parent>
@@ -19,7 +19,7 @@
1919
<artifactId>quarkus-smallrye-health-spi</artifactId>
2020
</dependency>
2121
<dependency>
22-
<groupId>io.quarkiverse.solace</groupId>
22+
<groupId>com.solace.quarkus</groupId>
2323
<artifactId>quarkus-solace</artifactId>
2424
<version>${project.version}</version>
2525
</dependency>

deployment/src/main/java/io/quarkiverse/solace/deployment/DevServicesConfig.java deployment/src/main/java/com/solace/quarkus/deployment/DevServicesConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.deployment;
1+
package com.solace.quarkus.deployment;
22

33
import java.util.Map;
44
import java.util.Optional;

deployment/src/main/java/io/quarkiverse/solace/deployment/DevServicesSolaceProcessor.java deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.deployment;
1+
package com.solace.quarkus.deployment;
22

33
import static io.quarkus.runtime.LaunchMode.DEVELOPMENT;
44

deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceBuildItem.java deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildItem.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.deployment;
1+
package com.solace.quarkus.deployment;
22

33
import io.quarkus.builder.item.SimpleBuildItem;
44

deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceBuildTimeConfig.java deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildTimeConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.deployment;
1+
package com.solace.quarkus.deployment;
22

33
import io.quarkus.runtime.annotations.ConfigGroup;
44
import io.quarkus.runtime.annotations.ConfigPhase;

deployment/src/main/java/io/quarkiverse/solace/deployment/SolaceProcessor.java deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.deployment;
1+
package com.solace.quarkus.deployment;
22

33
import java.util.Optional;
44
import java.util.function.Function;
@@ -9,12 +9,12 @@
99
import org.jboss.jandex.*;
1010

1111
import com.solace.messaging.MessagingService;
12+
import com.solace.quarkus.MessagingServiceClientCustomizer;
13+
import com.solace.quarkus.runtime.SolaceConfig;
14+
import com.solace.quarkus.runtime.SolaceRecorder;
15+
import com.solace.quarkus.runtime.observability.SolaceMetricBinder;
1216
import com.solacesystems.jcsmp.JCSMPFactory;
1317

14-
import io.quarkiverse.solace.MessagingServiceClientCustomizer;
15-
import io.quarkiverse.solace.runtime.SolaceConfig;
16-
import io.quarkiverse.solace.runtime.SolaceRecorder;
17-
import io.quarkiverse.solace.runtime.observability.SolaceMetricBinder;
1818
import io.quarkus.arc.SyntheticCreationalContext;
1919
import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
2020
import io.quarkus.arc.deployment.SyntheticBeansRuntimeInitBuildItem;
@@ -97,7 +97,7 @@ void configureNativeCompilation(BuildProducer<RuntimeInitializedClassBuildItem>
9797

9898
@BuildStep
9999
HealthBuildItem addHealthCheck(SolaceBuildTimeConfig buildTimeConfig) {
100-
return new HealthBuildItem("io.quarkiverse.solace.runtime.observability.SolaceHealthCheck",
100+
return new HealthBuildItem("com.solace.quarkus.runtime.observability.SolaceHealthCheck",
101101
buildTimeConfig.health().enabled());
102102
}
103103

deployment/src/test/java/io/quarkiverse/solace/test/SolaceContainer.java deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceContainer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.test;
1+
package com.solace.quarkus.deployment.test;
22

33
import java.io.IOException;
44
import java.time.Duration;

deployment/src/test/java/io/quarkiverse/solace/test/SolaceCustomizerTest.java deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceCustomizerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.test;
1+
package com.solace.quarkus.deployment.test;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

@@ -16,8 +16,8 @@
1616
import com.solace.messaging.MessagingServiceClientBuilder;
1717
import com.solace.messaging.config.RetryStrategy;
1818
import com.solace.messaging.publisher.DirectMessagePublisher;
19+
import com.solace.quarkus.MessagingServiceClientCustomizer;
1920

20-
import io.quarkiverse.solace.MessagingServiceClientCustomizer;
2121
import io.quarkus.test.QuarkusUnitTest;
2222

2323
public class SolaceCustomizerTest {

deployment/src/test/java/io/quarkiverse/solace/test/SolaceDevModeTest.java deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.test;
1+
package com.solace.quarkus.deployment.test;
22

33
import org.jboss.shrinkwrap.api.ShrinkWrap;
44
import org.jboss.shrinkwrap.api.spec.JavaArchive;

deployment/src/test/java/io/quarkiverse/solace/test/SolaceHelloWorldPersistentTest.java deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldPersistentTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.test;
1+
package com.solace.quarkus.deployment.test;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.awaitility.Awaitility.await;

deployment/src/test/java/io/quarkiverse/solace/test/SolaceHelloWorldTest.java deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.test;
1+
package com.solace.quarkus.deployment.test;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.awaitility.Awaitility.await;

deployment/src/test/java/io/quarkiverse/solace/test/SolaceTestResource.java deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceTestResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace.test;
1+
package com.solace.quarkus.deployment.test;
22

33
import java.util.Map;
44

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
2+
:summaryTableId: quarkus-solace-extension-common
3+
Common configuration for Solace Quarkus Extension Incoming and Outgoing channels
4+
[.configuration-reference.searchable, cols="80,.^10,.^10"]
5+
|===
6+
7+
h|[[quarkus-solace_configuration_common]]link:#quarkus-solace_configuration_common[Configuration property]
8+
9+
h|Type
10+
h|Default
11+
12+
a| [[quarkus-solace_quarkus.client.lazy.start]]`link:#quarkus-solace_quarkus.client.lazy.start[client.lazy.start]`
13+
14+
15+
[.description]
16+
--
17+
Whether the receiver or publisher is started at initialization or lazily at subscription time.
18+
19+
// ifdef::add-copy-button-to-env-var[]
20+
// Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_METRICS_ENABLED+++[]
21+
// endif::add-copy-button-to-env-var[]
22+
// ifndef::add-copy-button-to-env-var[]
23+
// Environment variable: `+++QUARKUS_SOLACE_METRICS_ENABLED+++`
24+
// endif::add-copy-button-to-env-var[]
25+
--|boolean
26+
| `false`
27+
28+
29+
a| [[quarkus-solace_quarkus.client.graceful-shutdown]]`link:#quarkus-solace_quarkus.client.graceful-shutdown[client.graceful-shutdown]`
30+
31+
32+
[.description]
33+
--
34+
Whether to shutdown client gracefully.
35+
36+
// ifdef::add-copy-button-to-env-var[]
37+
// Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_HEALTH_ENABLED+++[]
38+
// endif::add-copy-button-to-env-var[]
39+
// ifndef::add-copy-button-to-env-var[]
40+
// Environment variable: `+++QUARKUS_SOLACE_HEALTH_ENABLED+++`
41+
// endif::add-copy-button-to-env-var[]
42+
--|boolean
43+
|`true`
44+
45+
46+
a| [[quarkus-solace_quarkus.client.graceful-shutdown.wait-timeout]]`link:#quarkus-solace_quarkus.client.graceful-shutdown.wait-timeout[client.graceful-shutdown.wait-timeout]`
47+
48+
49+
[.description]
50+
--
51+
Timeout in milliseconds to wait for messages to finish processing before shutdown.
52+
53+
// ifdef::add-copy-button-to-env-var[]
54+
// Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_DEVSERVICES_ENABLED+++[]
55+
// endif::add-copy-button-to-env-var[]
56+
// ifndef::add-copy-button-to-env-var[]
57+
// Environment variable: `+++QUARKUS_SOLACE_DEVSERVICES_ENABLED+++`
58+
// endif::add-copy-button-to-env-var[]
59+
--|long
60+
|`10000`
61+
62+
|===

docs/modules/ROOT/pages/includes/quarkus-solace-extension-incoming.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ a| [[quarkus-solace_quarkus.consumer.queue.type]]`link:#quarkus-solace_quarkus.c
3131

3232
[.description]
3333
--
34-
The queue type of receiver.
34+
The queue type of receiver. Supported values `durable-exclusive`, `durable-non-exclusive`, `non-durable-exclusive`
3535

3636
// ifdef::add-copy-button-to-env-var[]
3737
// Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE_HEALTH_ENABLED+++[]
@@ -40,7 +40,7 @@ The queue type of receiver.
4040
// Environment variable: `+++QUARKUS_SOLACE_HEALTH_ENABLED+++`
4141
// endif::add-copy-button-to-env-var[]
4242
--|string
43-
|`durable-non-exclusive`
43+
|`durable-exclusive`
4444

4545

4646
a| [[quarkus-solace_quarkus.consumer.queue.missing-resource-creation-strategy]]`link:#quarkus-solace_quarkus.consumer.queue.missing-resource-creation-strategy[consumer.queue.missing-resource-creation-strategy]`
@@ -263,6 +263,6 @@ Whether to enable negative acknowledgments on failed messages. Nacks are support
263263
// Environment variable: `+++QUARKUS_SOLACE+++`
264264
// endif::add-copy-button-to-env-var[]
265265
--|`boolean`
266-
| `true`
266+
| `false`
267267

268268
|===

docs/modules/ROOT/pages/includes/quarkus-solace.adoc

+7-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,13 @@ a| [[quarkus-solace_quarkus.solace-extra]]`link:#quarkus-solace_quarkus.solace-e
176176

177177
[.description]
178178
--
179-
Any extra parameters to pass to the Solace client
179+
Any extra parameters to pass to the Solace client. +
180+
+
181+
+
182+
Refer to link:https://docs.solace.com/API-Developer-Online-Ref-Documentation/pubsubplus-java/constant-values.html#com.solace.messaging.config.SolaceProperties.AuthenticationProperties.SCHEME[AuthenticationProperties] and link:https://docs.solace.com/API-Developer-Online-Ref-Documentation/pubsubplus-java/constant-values.html#com.solace.messaging.config.SolaceProperties.TransportLayerProperties.COMPRESSION_LEVEL[TransportLayerProperties] for more configuration options +
183+
+
184+
+
185+
Example: To configure compression `quarkus.solace.transport.compression-level`
180186

181187
ifdef::add-copy-button-to-env-var[]
182188
Environment variable: env_var_with_copy_button:+++QUARKUS_SOLACE+++[]

docs/modules/ROOT/pages/index.adoc

+8-5
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ TIP: Solace Quarkus Extension for integrating with Solace PubSub+ message broker
77

88
== Installation
99

10-
If you want to use this extension, you need to add the `io.quarkiverse.solace:quarkus-solace` extension first to your build file.
10+
If you want to use this extension, you need to add the `com.solace.quarkus:quarkus-solace` extension first to your build file.
1111

1212
For instance, with Maven, add the following dependency to your POM file:
1313

1414
[source,xml,subs=attributes+]
1515
----
1616
<dependency>
17-
<groupId>io.quarkiverse.solace</groupId>
17+
<groupId>com.solace.quarkus</groupId>
1818
<artifactId>quarkus-solace</artifactId>
1919
<version>{project-version}</version>
2020
</dependency>
@@ -23,8 +23,6 @@ For instance, with Maven, add the following dependency to your POM file:
2323
[[extension-configuration-reference]]
2424
== Extension Configuration Reference
2525

26-
TIP: Remove this section if you don't have Quarkus configuration properties in your extension.
27-
2826
include::includes/quarkus-solace.adoc[leveloffset=+1, opts=optional]
2927

3028
[[extension-incoming-configuration-reference]]
@@ -35,4 +33,9 @@ include::includes/quarkus-solace-extension-incoming.adoc[leveloffset=+1, opts=op
3533
[[extension-outgoing-configuration-reference]]
3634
== Outgoing Configuration Reference
3735

38-
include::includes/quarkus-solace-extension-outgoing.adoc[leveloffset=+1, opts=optional]
36+
include::includes/quarkus-solace-extension-outgoing.adoc[leveloffset=+1, opts=optional]
37+
38+
[[extension-common-configuration-reference]]
39+
== Common Configuration Reference
40+
41+
include::includes/quarkus-solace-extension-common.adoc[leveloffset=+1, opts=optional]

docs/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>io.quarkiverse.solace</groupId>
7+
<groupId>com.solace.quarkus</groupId>
88
<artifactId>quarkus-solace-parent</artifactId>
99
<version>999-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
@@ -16,7 +16,7 @@
1616
<dependencies>
1717
<!-- Make sure the doc is built after the other artifacts -->
1818
<dependency>
19-
<groupId>io.quarkiverse.solace</groupId>
19+
<groupId>com.solace.quarkus</groupId>
2020
<artifactId>quarkus-solace-deployment</artifactId>
2121
<version>${project.version}</version>
2222
</dependency>

integration-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<groupId>io.quarkiverse.solace</groupId>
5+
<groupId>com.solace.quarkus</groupId>
66
<artifactId>quarkus-solace-parent</artifactId>
77
<version>999-SNAPSHOT</version>
88
</parent>

integration-tests/solace-client-integration-tests/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>io.quarkiverse.solace</groupId>
8+
<groupId>com.solace.quarkus</groupId>
99
<artifactId>quarkus-solace-integration-tests-parent</artifactId>
1010
<version>999-SNAPSHOT</version>
1111
</parent>
@@ -18,7 +18,7 @@
1818
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>
1919
</dependency>
2020
<dependency>
21-
<groupId>io.quarkiverse.solace</groupId>
21+
<groupId>com.solace.quarkus</groupId>
2222
<artifactId>quarkus-solace</artifactId>
2323
<version>${project.version}</version>
2424
</dependency>

integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceConsumer.java integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceConsumer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace;
1+
package com.solace.quarkus;
22

33
import java.util.List;
44
import java.util.concurrent.CopyOnWriteArrayList;

integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceCustomizer.java integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceCustomizer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace;
1+
package com.solace.quarkus;
22

33
import jakarta.enterprise.context.ApplicationScoped;
44

integration-tests/solace-client-integration-tests/src/main/java/io/quarkiverse/solace/SolaceResource.java integration-tests/solace-client-integration-tests/src/main/java/com/solace/quarkus/SolaceResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace;
1+
package com.solace.quarkus;
22

33
import java.util.List;
44

integration-tests/solace-client-integration-tests/src/test/java/io/quarkiverse/solace/SolaceIT.java integration-tests/solace-client-integration-tests/src/test/java/com/solace/quarkus/SolaceIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace;
1+
package com.solace.quarkus;
22

33
import io.quarkus.test.junit.QuarkusIntegrationTest;
44

integration-tests/solace-client-integration-tests/src/test/java/io/quarkiverse/solace/SolaceTest.java integration-tests/solace-client-integration-tests/src/test/java/com/solace/quarkus/SolaceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.quarkiverse.solace;
1+
package com.solace.quarkus;
22

33
import static org.awaitility.Awaitility.await;
44

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<artifactId>quarkiverse-parent</artifactId>
88
<version>15</version>
99
</parent>
10-
<groupId>io.quarkiverse.solace</groupId>
10+
<groupId>com.solace.quarkus</groupId>
1111
<artifactId>quarkus-solace-parent</artifactId>
1212
<version>999-SNAPSHOT</version>
1313
<packaging>pom</packaging>

pubsub-plus-connector/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>io.quarkiverse.solace</groupId>
7+
<groupId>com.solace.quarkus</groupId>
88
<artifactId>quarkus-solace-parent</artifactId>
99
<version>999-SNAPSHOT</version>
1010
</parent>

0 commit comments

Comments
 (0)