Merge pull request #1909 from lat-lon/fix/documentationLegacyConnectionDeprecated-1906

Set legacy JdbcConnection format to deprecated

Author: copierrj

deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/jdbc.xsd

@@ -10,6 +10,7 @@
         <jaxb:package name="org.deegree.db.legacy.jaxb" />
       </jaxb:schemaBindings>
     </appinfo>
+    <documentation>Deprecated configuration format, use DataSourceConnectionProvider instead</documentation>
   </annotation>
   <element name="JDBCConnection">
     <complexType>

deegree-documentation/src/main/asciidoc/serverconnections.adoc

@@ -366,7 +366,7 @@ org.deegree.sqldialect.postgis.PostGISDialectProvider)
 
 By default, the https://commons.apache.org/proper/commons-dbcp/[Apache Commons DBCP connection pool library] is provided with deegree webservices WAR file. In some cases you may consider another implementation as more appropriate to use. The following examples show how to use other connection pool provider. Keep in mind to add the mentioned libraries to the same classpath as the JDBC driver.
 
-==== PostgreSQL JDBC
+===== PostgreSQL JDBC
 
 The PostgreSQL JDBC driver provides two DataSource implementations which support, among other things, the configuration for multiple hosts. Read further in the https://jdbc.postgresql.org/documentation/datasource/[PostgreSQL JDBC driver documentation].
 This DataSource implementation requires the official PostgreSQL JDBC driver on the classpath.
@@ -389,7 +389,7 @@ Download the driver from: https://jdbc.postgresql.org/download/
 </DataSourceConnectionProvider>
 ----
 
-==== HikariCP
+===== Hikari Connection Pool
 
 The HikariCP project states that the implementation is a "zero-overhead" production ready JDBC connection pool and very lightweight.
 
@@ -411,7 +411,7 @@ Download the connection pool from: https://github.com/brettwooldridge/HikariCP
 </DataSourceConnectionProvider>
 ----
 
-===== c3p0
+===== c3p0 Connection Pool
 
 The c3p0 project states that the implementation is an easy-to-use library for making traditional JDBC drivers "enterprise-ready" by augmenting them with functionality defined by the JDBC 3 and 4 specs and the optional extensions to JDBC 2.
 
@@ -452,6 +452,8 @@ is called 'inspire', the database user is 'postgres' and password is
 </JDBCConnection>
 ----
 
+WARNING: When using this legacy configuration the connection pool size is hard coded to 5 connections as the minimal pool size and 25 connections as the maximum pool size.
+
 The legacy connection config file format is defined by schema file
 https://schemas.deegree.org/core/3.6/jdbc/jdbc.xsd. The root element is
 _JDBCConnection_. The following table lists the available configuration options. When
@@ -465,6 +467,8 @@ specifying them, their order must be respected.
 |Password |1..1 |String |DB password
 |===
 
+IMPORTANT: This configuration format is deprecated and will be removed in future versions. Switch to one of the described <<anchor-configuration-jdbc,JDBC connections>> using the `DataSourceConnectionProvider` instead.
+
 === Remote OWS connections
 
 Remote OWS connections are typically configured with a capabilities

deegree-documentation/src/main/asciidoc/webservices.adoc

@@ -1240,7 +1240,7 @@ The implementation of the visibility inspector checks whether a requested layer
 Of course, also non category layers can be configured here, but for most use cases category layers will be more useful.
 If no _CategoryLayerIdentifier_ are configured, the VisibilityInspector is applied to all layers.
 
-Note: If a _CategoryLayerIdentifier_ is configured, the visibility inspector will just be executed if exactly this layer is requested. Still, as already stated above, the visibility inspector is applied to the requested layer plus all of its sublayers.
+NOTE: If a _CategoryLayerIdentifier_ is configured, the visibility inspector will just be executed if exactly this layer is requested. Still, as already stated above, the visibility inspector is applied to the requested layer plus all of its sublayers.
 If just one or more sublayers of the configured _CategoryLayerIdentifier_ are requested, the visibility inspector is NOT applied.
 This behaviour prevents that complex analyses and/or functions are executed during each GetMap request.