From 55870bbf9d9319a4e45c73a92a22aada60e8945e Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Mon, 12 Feb 2024 17:21:06 +0100 Subject: [PATCH] [GEOS-11260] JNDI tutorial uses outdated syntax --- doc/en/user/source/tutorials/tomcat-jndi/tomcat-jndi.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/en/user/source/tutorials/tomcat-jndi/tomcat-jndi.rst b/doc/en/user/source/tutorials/tomcat-jndi/tomcat-jndi.rst index 30b3a2f1bfb..28d5a886753 100644 --- a/doc/en/user/source/tutorials/tomcat-jndi/tomcat-jndi.rst +++ b/doc/en/user/source/tutorials/tomcat-jndi/tomcat-jndi.rst @@ -28,7 +28,7 @@ Once that is done, the Tomcat configuration file :file:`{TOMCAT_HOME}/conf/conte driverClassName="oracle.jdbc.driver.OracleDriver" url="jdbc:oracle:thin:@localhost:1521:xe" username="xxxxx" password="xxxxxx" - maxActive="20" + maxTotal="20" initialSize="0" minIdle="0" maxIdle="8" @@ -44,6 +44,8 @@ Once that is done, the Tomcat configuration file :file:`{TOMCAT_HOME}/conf/conte /> +.. note:: The above configuration is valid for Tomcat 8+, while Tomcat 7.x would use ``maxActive`` in place of ``maxTotal``. + The example sets up a connection pool connecting to the local Oracle XE instance. The pool configuration shows is quite full-fledged: @@ -113,7 +115,7 @@ Then the following code must be added to the Tomcat configuration file :file:`{T driverClassName="org.postgresql.Driver" url="jdbc:postgresql://localhost:5432/test" username="xxxxx" password="xxxxxx" - maxActive="20" + maxTotal="20" initialSize="0" minIdle="0" maxIdle="8" @@ -160,7 +162,7 @@ Then the following code must be written in the Tomcat configuration file :file:` driverClassName="com.microsoft.sqlserver.jdbc.SQLServerDriver" url="jdbc:sqlserver://localhost:1433;databaseName=test;user=admin;password=admin;" username="admin" password="admin" - maxActive="20" + maxTotal="20" initialSize="0" minIdle="0" maxIdle="8"