Skip to content

Commit 7d7e934

Browse files
committed
Sync documentation of main branch
1 parent 58746d1 commit 7d7e934

File tree

7 files changed

+192
-30
lines changed

7 files changed

+192
-30
lines changed

_generated-doc/main/infra/quarkus-all-build-items.adoc

Lines changed: 118 additions & 28 deletions
Large diffs are not rendered by default.

_versions/main/guides/amqp-dev-services.adoc

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,27 @@ IMPORTANT: The configured image must be _compatible_ with the `activemq-artemis-
5959
The container is launched with the `AMQ_USER`, `AMQ_PASSWORD` and `AMQ_EXTRA_ARGS` environment variables.
6060
The ports 5672 and 8161 (web console) are exposed.
6161

62+
[[Compose]]
63+
== Compose
64+
65+
Dev Services for AMQP supports xref:compose-dev-services.adoc[Compose Dev Services].
66+
It relies on a `compose-devservices.yml`, such as:
67+
68+
[source,yaml]
69+
----
70+
name: <application name>
71+
services:
72+
artemis:
73+
image: quay.io/artemiscloud/activemq-artemis-broker:1.0.28
74+
ports:
75+
- "5672"
76+
- "8161"
77+
environment:
78+
AMQ_USER: quarkus
79+
AMQ_PASSWORD: quarkus
80+
AMQ_EXTRA_ARGS: --no-autotune --mapped --no-fsync --relax-jolokia
81+
----
82+
6283
[[configuration-reference-devservices]]
6384
== Configuration reference
6485

_versions/main/guides/compose-dev-services.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ The following is the list of platform extensions with dev services support:
170170
|Exposed Port
171171

172172
| AMQP
173-
| amqp, activemq-artemis, rabbitmq
173+
| amqp, activemq-artemis, amq-broker, rabbitmq
174174
| 5672
175175

176176
| Apicurio Registry
@@ -234,7 +234,7 @@ The following is the list of platform extensions with dev services support:
234234
| 6379
235235

236236
| Infinispan
237-
| infinispan
237+
| infinispan, datagrid
238238
| 11222
239239

240240
| Elasticsearch

_versions/main/guides/databases-dev-services.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,8 @@ services:
321321
ORACLE_DATABASE: quarkus
322322
APP_USER: quarkus
323323
APP_USER_PASSWORD: quarkus
324+
labels:
325+
io.quarkus.devservices.compose.wait_for.logs: .*DATABASE IS READY TO USE.*
324326
mssql:
325327
image: mcr.microsoft.com/mssql/server:2022-latest
326328
ports:

_versions/main/guides/infinispan-dev-services.adoc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,24 @@ The default service name is `infinispan`.
204204
Sharing is enabled by default in dev mode, but disabled in test mode.
205205
You can disable the sharing with `quarkus.infinispan-client.devservices.shared=false`
206206

207+
== Compose
208+
209+
Dev Services for Infinispan supports xref:compose-dev-services.adoc[Compose Dev Services].
210+
It relies on a `compose-devservices.yml`, such as:
211+
212+
[source,yaml]
213+
----
214+
name: test-project
215+
services:
216+
infinispan:
217+
image: quay.io/infinispan/server:15.0.18.Final
218+
ports:
219+
- '11222'
220+
environment:
221+
- USER=quarkus
222+
- PASS=quarkus
223+
----
224+
207225
== Configuration reference
208226

209227
include::{generated-dir}/config/quarkus-infinispan-client_quarkus.infinispan-client.devservices.adoc[opts=optional, leveloffset=+1]

_versions/main/guides/qute-reference.adoc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,6 +1127,15 @@ This section can be used to include another template and possibly override some
11271127
<1> Include a template with id `foo`. The included template can reference data from the current context.
11281128
<2> It's also possible to define optional parameters that can be used in the included template.
11291129

1130+
By default, the first unnamed parameter represents the id of a template that should be included.
1131+
And it is taken as is.
1132+
For example, `{#include bar/foo /}` includes a template with id `bar/foo`; i.e. `src/main/resources/templates/bar/foo.html` could be matched.
1133+
However, it is also possible to supply the template id dynamically.
1134+
Just add the `_id` parameter to the tag.
1135+
In this case, the argument value of the `_id` parameter represents an expression that is resolved and the result represents the template id.
1136+
For example, `{#include _id=bar.foo /}` means that `bar.foo` is first resolved and then the resulting template id is used.
1137+
1138+
11301139
_Template inheritance_ makes it possible to reuse template layouts.
11311140

11321141
.Template "base"

_versions/main/guides/writing-native-applications-tips.adoc

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,28 @@ public class MyReflectionConfiguration {
261261
Note that the order of the specified proxy interfaces is significant. For more information, see link:https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Proxy.html[Proxy javadoc].
262262
====
263263

264+
=== Registering resource bundles and resource files
265+
266+
Resource bundles can be registered to be included in the native image by using `@RegisterResourceBundle`:
267+
268+
[source,java]
269+
----
270+
@RegisterResourceBundle(bundleName = "messages")
271+
@RegisterResourceBundle(bundleName = "errors", moduleName = "foo")
272+
public class NativeConfiguration {
273+
}
274+
----
275+
276+
Other resources files can be registered to be included in the native image by using `@RegisterResources`:
277+
278+
[source,java]
279+
----
280+
@RegisterResources(globs = ["path1/level*/**", "path2/level5/**"])
281+
@RegisterResources(globs = ["**.txt"])
282+
public class NativeConfiguration {
283+
}
284+
----
285+
264286
[[delay-class-init-in-your-app]]
265287
=== Delaying class initialization
266288

0 commit comments

Comments
 (0)