Skip to content

Commit ca03029

Browse files
markfodor-gsgaaime
authored andcommitted
[GEOS-12006] remove H2 usage and leftover references
1 parent 3cf6a77 commit ca03029

File tree

17 files changed

+15
-568
lines changed

17 files changed

+15
-568
lines changed

documentation/en/user/source/concepts/stores.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ GeoWebCache historically used to have three storage components, responsible for
77

88
The **blobstore** is a storage mechanism for tiles, whose default implementation is file system based.
99

10-
The **metastore** was an optional H2 based storage mechanism for meta-information about tiles, such as tile creation time, size and usage of request parameters.
11-
1210
The **disk quota** mechanism uses a nosql embedded database to track the tiles disk usage and expire tiles based on user set policies.
1311

1412
Since GeoWebCache 1.4.0 the metastore was replaced with a full filesystem based solution, making the blobstore responsible for the information previously tracked by the metastore.

documentation/en/user/source/configuration/diskquotas.rst

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,14 @@ It is possible to set the amount of threads to use when processing the disk quot
153153
Disk quota storage
154154
------------------
155155
156-
The disk quota subystem defaults to use an embedded Berkeley DB whose storage is located in the cache directory, there is however also the possibility of using either an embedded H2 database, against storing information in the cache directory, or a standard Oracle or PostgreSQL database.
157-
158-
In order to switch from the Berkeley DB to the embedded H2 storage the :file:`geowebcache-diskquota.xml` must contain the ``quotaStore`` element set to ``H2``:
159-
156+
The disk quota subystem defaults to use an embedded Berkeley DB whose storage is located in the cache directory, there is however also the possibility of using either an embedded HSQL database, against storing information in the cache directory, or a standard Oracle or PostgreSQL database.
157+
In order to switch from the Berkeley DB to the embedded HSQL storage the :file:`geowebcache-diskquota.xml` must contain the ``quotaStore`` element set to ``HSQL``:
160158
.. code-block:: xml
161-
162159
<?xml version="1.0" encoding="utf-8"?>
163160
<gwcQuotaConfiguration>
164161
<enabled>false</enabled>
165-
<quotaStore>H2</quotaStore>
162+
<quotaStore>HSQL</quotaStore>
166163
...
167-
168164
</gwcQuotaConfiguration>
169165
170166
@@ -180,7 +176,7 @@ In order to switch from the Berkeley DB to the freeform JDBC sources the :file:`
180176
181177
</gwcQuotaConfiguration>
182178
183-
In this case a separate file, :file:`geowebcache-diskquota-jdbc.xml` will contain the configuration for the chosen database containing the chosen DBMS dialect, at the time of writing the possible values are ``HSQL``, ``H2``, ``Oracle``, ``PostgreSQL``.
179+
In this case a separate file, :file:`geowebcache-diskquota-jdbc.xml` will contain the configuration for the chosen database containing the chosen DBMS dialect, at the time of writing the possible values are ``HSQL``, ``Oracle``, ``PostgreSQL``.
184180
185181
The connection pool can be either provided locally, in such case a DBCP based connection pool will be instantiated, or provided via JNDI.
186182
The JDNI configuration is as simple as follows:
@@ -213,8 +209,7 @@ The local connection pool can instead be configured by specifying the following:
213209
</gwcJdbcConfiguration>
214210
215211
.. note::
216-
217-
The `validationQuery` parameter is optional. Any supplied value is restricted based on dialect: `H2` requires ``SELECT 1``, and `Oracle` uses ``SELECT 1 FROM DUAL``. Remaining dialects are recommendation to use ``SELECT 1``.
212+
The `validationQuery` parameter is optional. Any supplied value is restricted based on dialect: HSQL uses SELECT 1 FROM INFORMATION_SCHEMA.SYSTEM_USERS, Oracle uses SELECT 1 FROM DUAL, and most other dialects can use plain SELECT 1.
218213
219214
Disk quota schema
220215
-----------------

geowebcache/core/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@
4343
<groupId>commons-codec</groupId>
4444
<artifactId>commons-codec</artifactId>
4545
</dependency>
46-
<dependency>
47-
<groupId>com.h2database</groupId>
48-
<artifactId>h2</artifactId>
49-
<optional>true</optional>
50-
</dependency>
5146

5247
<!-- logging -->
5348
<!-- log4j 2 -->

geowebcache/core/src/main/java/org/geowebcache/storage/MetastoreRemover.java

Lines changed: 0 additions & 304 deletions
This file was deleted.

0 commit comments

Comments
 (0)