Skip to content

Commit

Permalink
Moved concurrency limit over to docs. Create new folder for Webserver.
Browse files Browse the repository at this point in the history
Signed-off-by: Santiago Pericas-Geertsen <[email protected]>
  • Loading branch information
spericas authored and romain-grecourt committed Feb 4, 2025
1 parent a56c087 commit 221942f
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 26 deletions.
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/about/doc_overview.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2018, 2024 Oracle and/or its affiliates.
Copyright (c) 2018, 2025 Oracle and/or its affiliates.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -112,7 +112,7 @@ xref:{rootdir}/mp/guides/overview.adoc[MP Guides]
.Advanced SE Features
[icon=hotel_class]
--
xref:{rootdir}/se/webserver.adoc[Helidon WebServer]
xref:{rootdir}/se/webserver/webserver.adoc[Helidon WebServer]
xref:{rootdir}/se/metrics/metrics.adoc[Helidon Metrics]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Still, there might be cases where you wish to change configuration options from
For details on the following options please see:
* xref:../../se/webserver.adoc#_configuration_options[WebServer Configuration]
* xref:../../se/webserver/webserver.adoc#_configuration_options[WebServer Configuration]
* xref:../../config/io_helidon_common_socket_SocketOptions.adoc[WebServer Socket Configuration]
== Summary of Tuning Options
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/mp/grpc/client.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2019, 2024 Oracle and/or its affiliates.
Copyright (c) 2019, 2025 Oracle and/or its affiliates.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -114,7 +114,7 @@ grpc:
TLS in the gRPC MP client section is configured in the same way as in other Helidon
components such as the webserver. For more information see
xref:{rootdir}/se/webserver.adoc#_configuring_tls[Configuring TLS].
xref:{rootdir}/se/webserver/webserver.adoc#_configuring_tls[Configuring TLS].
Given that TLS is enabled by default in gRPC, it must be explicitly turned off by
setting the `enabled` flag to `false` when connecting to an unsecure endpoint.
Expand Down
6 changes: 3 additions & 3 deletions docs/src/main/asciidoc/se/cors.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2022, 2024 Oracle and/or its affiliates.
Copyright (c) 2022, 2025 Oracle and/or its affiliates.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -139,7 +139,7 @@ The link:{helidon-github-examples-url}/quickstarts/helidon-quickstart-se[Helidon
lets you change the greeting by sending a `PUT` request to the `/greet/greeting` resource.
This example, based on the QuickStart greeting app, uses the low-level `CrossOriginConfig` API and
the `CorsSupport` API to influence the xref:{rootdir}/se/webserver.adoc#routing[routing],
the `CorsSupport` API to influence the xref:{rootdir}/se/webserver/webserver.adoc#routing[routing],
thereby determining how that resource is shared. (If desired, you can use <<Configuration, configuration>> instead
of the low-level API.)
Expand Down Expand Up @@ -251,7 +251,7 @@ For a complete example, see {helidon-github-examples-url}/cors[Helidon SE CORS E
include::{rootdir}/includes/cors.adoc[tag=cors-and-requested-uri-intro]
You can configure how the Helidon server handles these headers as described in the documentation for
xref:{rootdir}/se/webserver.adoc#_requested_uri_discovery[requested URI discovery].
xref:{rootdir}/se/webserver/webserver.adoc#_requested_uri_discovery[requested URI discovery].
include::{rootdir}/includes/cors.adoc[tag=cors-and-requested-uri-wrapup]
Expand Down
6 changes: 3 additions & 3 deletions docs/src/main/asciidoc/se/guides/upgrade_3x.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2022, 2024 Oracle and/or its affiliates.
Copyright (c) 2022, 2025 Oracle and/or its affiliates.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -37,7 +37,7 @@ Please follow the instructions in xref:{rootdir}/about/prerequisites.adoc[Prereq
Handling routes based on the protocol version is now possible by registering specific routes
on routing builder.
For further information check xref:../webserver.adoc[WebServer Documentation]
For further information check xref:../webserver/webserver.adoc[WebServer Documentation]
== Http/2 Support
Expand Down Expand Up @@ -82,7 +82,7 @@ server:
max-upgrade-content-length: 16384
----
For further information check xref:../webserver.adoc[WebServer Documentation]
For further information check xref:../webserver/webserver.adoc[WebServer Documentation]
== WebSocket
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/se/guides/upgrade_4x.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ If you want full control using the API, you still have that option.
For more information see:
* xref:../observability.adoc[Observability feature support]
* xref:../webserver.adoc#_media_types_support[Media types support]
* xref:../webserver/webserver.adoc#_media_types_support[Media types support]
== Routing Configuration
Expand Down Expand Up @@ -176,7 +176,7 @@ It receives `HttpRules` object with routes description.
WARNING: These changes make Helidon 4 incompatible with previous versions.
Learn more about `HttpService` and `Routing` at xref:../webserver.adoc[Helidon SE WebServer]
Learn more about `HttpService` and `Routing` at xref:../webserver/webserver.adoc[Helidon SE WebServer]
=== Other Significant Changes
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/se/introduction.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2019, 2024 Oracle and/or its affiliates.
Copyright (c) 2019, 2025 Oracle and/or its affiliates.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -133,7 +133,7 @@ HTTP client that handles responses to the HTTP requests.
//WebServer
[CARD]
.WebServer
[icon=settings_ethernet,link=webserver.adoc]
[icon=settings_ethernet,link=webserver/webserver.adoc]
--
A programmatic HTTP API that uses virtual threads to handle nearly unlimited concurrent requests without blocking a platform thread or starving other requests.
// Each request runs in its own dedicated thread, so it is free to perform blocking operations in a simple synchronous way without blocking a platform thread or starving other requests.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2018, 2024 Oracle and/or its affiliates.
Copyright (c) 2018, 2025 Oracle and/or its affiliates.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -25,7 +25,7 @@ include::{rootdir}/includes/se.adoc[]
== WebServer
To integrate xref:../webserver.adoc[web server], add the following dependency to your project's pom.xml file:
To integrate xref:../webserver/webserver.adoc[web server], add the following dependency to your project's pom.xml file:
[source,xml]
.Maven Dependency
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
:description: Helidon WebServer Introduction
:keywords: helidon, java, webserver, tls
:feature-name: WebServer
:rootdir: {docdir}/..
:rootdir: {docdir}/../..
:requested-uri-discovery-inc: {rootdir}/includes/server/requested-uri-discovery.adoc
include::{rootdir}/includes/se.adoc[]
Expand Down Expand Up @@ -526,22 +526,22 @@ first.
|<<Access Log, Access Log>>
|1000
|xref:tracing.adoc[Tracing]
|xref:{rootdir}/se/tracing.adoc[Tracing]
|900
|xref:cors.adoc[CORS]
|xref:{rootdir}/se/cors.adoc[CORS]
|850
|xref:security/introduction.adoc[Security]
|xref:{rootdir}/se/security/introduction.adoc[Security]
|800
|Routing (all handlers and filters)
|100
|xref:openapi/openapi.adoc[OpenAPI]
|xref:{rootdir}/se/openapi/openapi.adoc[OpenAPI]
|90
|xref:observability.adoc[Observability]
|xref:{rootdir}/se/observability.adoc[Observability]
|80
|===
Expand Down
8 changes: 5 additions & 3 deletions docs/src/main/asciidoc/sitegen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ backend:
- "webclient.adoc"
- "dbclient.adoc"
- "performance-tuning.adoc"
- "concurrency-limits.adoc"
- type: "MENU"
title: "Config"
dir: "config"
Expand Down Expand Up @@ -436,12 +435,15 @@ backend:
sources:
- "engine.adoc"
- "rsoperators.adoc"
- type: "PAGE"
- type: "MENU"
title: "Webserver"
source: "webserver.adoc"
dir: "webserver"
glyph:
type: "icon"
value: "settings_ethernet"
sources:
- "webserver.adoc"
- "concurrency-limits.adoc"
- type: "PAGE"
title: "Scheduling"
source: "scheduling.adoc"
Expand Down

0 comments on commit 221942f

Please sign in to comment.