Skip to content

Commit df91e09

Browse files
authored
Merge pull request #234 from rhusar/jdk17
Add JDK information to the support matrix + Fix xref: links to developer guide
2 parents 25cfd2f + a640cbc commit df91e09

5 files changed

Lines changed: 13 additions & 12 deletions

File tree

docs/src/main/asciidoc/developer/design.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[[mod_cluster-design]]
12
= ModClusterDesign
23

34
NOTE: {editurl}design.adoc[{editnote}]

docs/src/main/asciidoc/developer/encrypting_connection.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
= Encrypting connection between httpd and TC
1+
[[encrypting-connection-tomcat]]
2+
= Encrypting connection between httpd and Tomcat
23

34
NOTE: {editurl}encrypting_connection.adoc[{editnote}]
45

docs/src/main/asciidoc/developer/mod_proxy_forwarding.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
= Forwarding SSL environment when using http/https proxy:
1+
[[modproxy-forwarding]]
2+
= Forwarding SSL environment when using http/https proxy
23

34
NOTE: {editurl}mod_proxy_forwarding.adoc[{editnote}]
45

docs/src/main/asciidoc/introduction.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ the former name mod_cluster is currently used for container implementation.
3434
=== Container Integration Modules
3535

3636
|===
37-
| Release | Tomcat versions | Code | Documentation
37+
|Release |Tomcat versions |Java SE |Code |Documentation
3838

39-
| `2.1` (in development) | `11.0`, `10.1`, `9.0` | https://github.com/modcluster/mod_cluster/tree/main[SCM Branch] | https://docs.modcluster.io/apidocs/2.1/[Javadoc]
40-
| `2.0` | `10.1`, `9.0`, `8.5` (EOL) | https://github.com/modcluster/mod_cluster/tree/2.0.x[SCM Branch] | https://docs.modcluster.io/apidocs/2.0/[Javadoc]
41-
| `1.4` | `9.0`, `8.5` (EOL), `8.0` (EOL), `7.0` (EOL) | https://github.com/modcluster/mod_cluster/tree/1.4.x[SCM Branch] | https://docs.modcluster.io/apidocs/1.4/[Javadoc]
39+
|`2.1` |`11.0`, `10.1`, `9.0` |17 |https://github.com/modcluster/mod_cluster/tree/main[SCM Branch] |https://docs.modcluster.io/apidocs/2.1/[Javadoc]
40+
|`2.0` |`10.1`, `9.0`, `8.5` (EOL) |11 |https://github.com/modcluster/mod_cluster/tree/2.0.x[SCM Branch] |https://docs.modcluster.io/apidocs/2.0/[Javadoc]
41+
|`1.4` |`9.0`, `8.5` (EOL), `8.0` (EOL), `7.0` (EOL) |8 |https://github.com/modcluster/mod_cluster/tree/1.4.x[SCM Branch] |https://docs.modcluster.io/apidocs/1.4/[Javadoc]
4242
|===
4343

4444
=== Apache HTTP modules
@@ -90,7 +90,7 @@ that server.
9090
* AJP is optional
9191

9292
Unlike mod_jk, mod_proxy_cluster does not require AJP. httpd connections to application server nodes can use HTTP, HTTPS, or AJP.
93-
The original concepts are described in a xref:developer/design.adoc[Design] article.
93+
The original concepts are described in a xref:developer/index.adoc#mod_cluster-design[Design] article.
9494

9595
== Requirements
9696

docs/src/main/asciidoc/security.adoc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ stored in the sslKeyStore of the ClusterListener parameters.
5151

5252
==== ClusterListener configuration part
5353

54-
There is a xref:developer/cluster_listener.adoc[ModCluster Listener] article
54+
There is a xref:developer/index.adoc#ClusterListener[ModCluster Listener] article
5555
describing the SSL parameters of the ClusterListener. See in one example
5656
how easy the configuration is:
5757

@@ -215,8 +215,7 @@ Using https allows to encrypt communications between httpd and JBossWEB.
215215
But due to the resources it needs that no advised to use it in high
216216
load configuration.
217217

218-
(See xref:developer/encrypting_connection.adoc[Encrypting connection between httpd
219-
and TC] for detailed instructions).
218+
See xref:developer/index.adoc#encrypting-connection-tomcat[Encrypting connection between httpd and TC] for detailed instructions.
220219

221220
httpd is configured to be a client for AS/TC, so it should provide a
222221
certificate AS/TC will accept and have a private key to encrypt the
@@ -313,8 +312,7 @@ SSLValve and export the SSL variable as header in the request in httpd.
313312
If you are using AJP, mod_proxy_ajp will read the SSL variables and
314313
forward them to JBossWEB automatically.
315314

316-
(See xref:developer/mod_proxy_forwarding.adoc[Forwarding SSL environment when using
317-
http/https proxy] for detailed instructions).
315+
See xref:developer/index.adoc#modproxy-forwarding[Forwarding SSL environment when using http/https proxy] for detailed instructions.
318316

319317
The SSL variable used by mod_proxy_ajp are the following:
320318

0 commit comments

Comments
 (0)