Skip to content

Commit 30c15ce

Browse files
committed
HHH-18902 completely remove Proxool
it has not been updated in 20 years!
1 parent afa2b33 commit 30c15ce

File tree

23 files changed

+7
-781
lines changed

23 files changed

+7
-781
lines changed

documentation/documentation.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ configurations {
5252
agroal
5353
c3p0
5454
hikaricp
55-
proxool
5655
vibur
5756

5857
jcache
@@ -72,7 +71,6 @@ configurations {
7271
extendsFrom agroal
7372
extendsFrom c3p0
7473
extendsFrom hikaricp
75-
extendsFrom proxool
7674
extendsFrom vibur
7775
extendsFrom jcache
7876
extendsFrom jpamodelgen
@@ -133,7 +131,6 @@ dependencies {
133131
reportAggregation project(':hibernate-hikaricp')
134132
reportAggregation project(':hibernate-jcache')
135133
reportAggregation project(':hibernate-micrometer')
136-
reportAggregation project(':hibernate-proxool')
137134
reportAggregation project(':hibernate-spatial')
138135
reportAggregation project(':hibernate-vibur')
139136
reportAggregation project(':hibernate-ant')
@@ -163,9 +160,6 @@ dependencies {
163160
hikaricp project( ':hibernate-hikaricp' )
164161
javadocSources project( path: ':hibernate-hikaricp', configuration: 'javadocSources' )
165162

166-
proxool project( ':hibernate-proxool' )
167-
javadocSources project( path: ':hibernate-proxool', configuration: 'javadocSources' )
168-
169163
vibur project( ':hibernate-vibur' )
170164
javadocSources project( path: ':hibernate-vibur', configuration: 'javadocSources' )
171165

@@ -565,12 +559,6 @@ settingsDocumentation {
565559
description = "Settings related to integrating with the C3P0 Connection pool"
566560
settingsClassName "org.hibernate.cfg.C3p0Settings"
567561
}
568-
proxool {
569-
explicitPosition = 5
570-
summary = "Proxool Connection Pool Settings"
571-
description = "Settings related to integrating with the Proxool Connection pool"
572-
settingsClassName "org.hibernate.cfg.ProxoolSettings"
573-
}
574562
transaction {
575563
explicitPosition = 6
576564
summary = "Transaction Environment Settings"

documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ transitive dependencies based on the features being used or not.
5353
|hibernate-c3p0| Support for https://www.mchange.com/projects/c3p0/[C3P0] connection pooling
5454
|hibernate-hikaricp| Support for https://github.com/brettwooldridge/HikariCP/[HikariCP] connection pooling
5555
|hibernate-vibur| Support for https://www.vibur.org/[Vibur DBCP] connection pooling
56-
|hibernate-proxool| Support for https://proxool.sourceforge.net/[Proxool] connection pooling
5756
|hibernate-ucp| Support for https://docs.oracle.com/en/database/oracle/oracle-database/23/jjucp/intro.html[Universal Connection Pool] connection pooling
5857
|hibernate-jcache| Integration with https://jcp.org/en/jsr/detail?id=107$$[JCache], allowing any compliant implementation as a second-level cache provider
5958
|hibernate-graalvm| Experimental extension to make it easier to compile applications as a https://www.graalvm.org/[GraalVM] native image

documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ Hibernate will internally determine which `ConnectionProvider` to use based on t
1616
1. If `hibernate.connection.provider_class` is set, it takes precedence
1717
2. else if `hibernate.connection.datasource` is set -> <<database-connectionprovider-datasource>>
1818
3. else if any setting prefixed by `hibernate.c3p0.` is set -> <<database-connectionprovider-c3p0>>
19-
4. else if any setting prefixed by `hibernate.proxool.` is set -> <<database-connectionprovider-proxool>>
20-
5. else if any setting prefixed by `hibernate.hikari.` is set -> <<database-connectionprovider-hikari>>
21-
6. else if any setting prefixed by `hibernate.vibur.` is set -> <<database-connectionprovider-vibur>>
22-
7. else if any setting prefixed by `hibernate.agroal.` is set -> <<database-connectionprovider-agroal>>
23-
8. else if any setting prefixed by `hibernate.oracleucp.` is set -> <<database-connectionprovider-ucp>>
24-
9. else if `hibernate.connection.url` is set -> <<database-connectionprovider-drivermanager>>
25-
10. else -> <<database-connectionprovider-provided>>
19+
4. else if any setting prefixed by `hibernate.hikari.` is set -> <<database-connectionprovider-hikari>>
20+
5. else if any setting prefixed by `hibernate.vibur.` is set -> <<database-connectionprovider-vibur>>
21+
6. else if any setting prefixed by `hibernate.agroal.` is set -> <<database-connectionprovider-agroal>>
22+
7. else if any setting prefixed by `hibernate.oracleucp.` is set -> <<database-connectionprovider-ucp>>
23+
8. else if `hibernate.connection.url` is set -> <<database-connectionprovider-drivermanager>>
24+
9. else -> <<database-connectionprovider-provided>>
2625

2726
[[database-connectionprovider-datasource]]
2827
=== Using DataSources
@@ -72,38 +71,6 @@ Transaction isolation of the Connections is managed by the `ConnectionProvider`
7271
Any other settings prefixed with `hibernate.c3p0.`:: Will have the `hibernate.` portion stripped and be passed to c3p0.
7372
Any other settings prefixed with `c3p0.`:: Get passed to c3p0 as is. See https://www.mchange.com/projects/c3p0/#configuration[c3p0 configuration]
7473

75-
[[database-connectionprovider-proxool]]
76-
=== Using Proxool
77-
78-
[IMPORTANT]
79-
====
80-
To use the Proxool integration, the application must include the `hibernate-proxool` module jar (as well as its dependencies) on the classpath.
81-
====
82-
83-
Hibernate also provides support for applications to use https://proxool.sourceforge.net/[Proxool] connection pooling.
84-
85-
Transaction isolation of the Connections is managed by the `ConnectionProvider` itself. See <<database-connectionprovider-isolation>>.
86-
87-
[[database-connectionprovider-proxool-existing]]
88-
==== Using existing Proxool pools
89-
90-
Controlled by the `hibernate.proxool.existing_pool` setting.
91-
If set to true, this ConnectionProvider will use an already existing Proxool pool by alias as indicated by the `hibernate.proxool.pool_alias` setting.
92-
93-
[[database-connectionprovider-proxool-jaxp]]
94-
==== Configuring Proxool via XML
95-
96-
The `hibernate.proxool.xml` setting names a Proxool configuration XML file to be loaded as a classpath resource and loaded by Proxool's JAXPConfigurator.
97-
See https://proxool.sourceforge.net/configure.html[proxool configuration].
98-
`hibernate.proxool.pool_alias` must be set to indicate which pool to use.
99-
100-
[[database-connectionprovider-proxool-properties]]
101-
==== Configuring Proxool via Properties
102-
103-
The `hibernate.proxool.properties` setting names a Proxool configuration properties file to be loaded as a classpath resource and loaded by Proxool's `PropertyConfigurator`.
104-
See https://proxool.sourceforge.net/configure.html[proxool configuration].
105-
`hibernate.proxool.pool_alias` must be set to indicate which pool to use.
106-
10774
[[database-connectionprovider-hikari]]
10875
=== Using HikariCP
10976

etc/hibernate.properties

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -217,22 +217,6 @@ hibernate.connection.pool_size 1
217217

218218

219219

220-
##############################
221-
### Proxool Connection Pool###
222-
##############################
223-
224-
## Properties for external configuration of Proxool
225-
226-
hibernate.proxool.pool_alias pool1
227-
228-
## Only need one of the following
229-
230-
#hibernate.proxool.existing_pool true
231-
#hibernate.proxool.xml proxool.xml
232-
#hibernate.proxool.properties proxool.properties
233-
234-
235-
236220
#################################
237221
### Plugin ConnectionProvider ###
238222
#################################
@@ -242,7 +226,6 @@ hibernate.proxool.pool_alias pool1
242226
#hibernate.connection.provider_class org.hibernate.connection.DriverManagerConnectionProvider
243227
#hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider
244228
#hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider
245-
#hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider
246229

247230

248231

etc/hibernate.properties.template

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -191,22 +191,6 @@ hibernate.connection.pool_size 1
191191

192192

193193

194-
##############################
195-
### Proxool Connection Pool###
196-
##############################
197-
198-
## Properties for external configuration of Proxool
199-
200-
hibernate.proxool.pool_alias pool1
201-
202-
## Only need one of the following
203-
204-
#hibernate.proxool.existing_pool true
205-
#hibernate.proxool.xml proxool.xml
206-
#hibernate.proxool.properties proxool.properties
207-
208-
209-
210194
#################################
211195
### Plugin ConnectionProvider ###
212196
#################################
@@ -217,7 +201,6 @@ hibernate.proxool.pool_alias pool1
217201
#hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider
218202
#hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider
219203
#hibernate.connection.provider_class org.hibernate.connection.DBCPConnectionProvider
220-
#hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider
221204

222205

223206

hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @author Steve Ebersole
2121
*/
22-
public interface JdbcSettings extends C3p0Settings, ProxoolSettings, AgroalSettings, HikariCPSettings {
22+
public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSettings {
2323

2424
/**
2525
* Specifies a JTA {@link javax.sql.DataSource} to use for Connections.

hibernate-core/src/main/java/org/hibernate/cfg/ProxoolSettings.java

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

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import static org.hibernate.cfg.JdbcSettings.POOL_SIZE;
4242
import static org.hibernate.cfg.JdbcSettings.URL;
4343
import static org.hibernate.cfg.JdbcSettings.USER;
44-
import static org.hibernate.cfg.ProxoolSettings.PROXOOL_CONFIG_PREFIX;
4544
import static org.hibernate.cfg.SchemaToolingSettings.ENABLE_SYNONYMS;
4645
import static org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentImpl.isMultiTenancyEnabled;
4746
import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
@@ -66,11 +65,6 @@ public class ConnectionProviderInitiator implements StandardServiceInitiator<Con
6665
*/
6766
public static final String C3P0_STRATEGY = "c3p0";
6867

69-
/**
70-
* The strategy for proxool connection pooling
71-
*/
72-
public static final String PROXOOL_STRATEGY = "proxool";
73-
7468
/**
7569
* The strategy for hikari connection pooling
7670
*/
@@ -162,9 +156,6 @@ private ConnectionProvider instantiateConnectionProvider(
162156
else if ( hasConfiguration( configurationValues, C3P0_CONFIG_PREFIX ) ) {
163157
return instantiateProvider( strategySelector, C3P0_STRATEGY );
164158
}
165-
else if (hasConfiguration( configurationValues, PROXOOL_CONFIG_PREFIX )) {
166-
return instantiateProvider( strategySelector, PROXOOL_STRATEGY );
167-
}
168159
else if ( hasConfiguration( configurationValues, HIKARI_CONFIG_PREFIX ) ) {
169160
return instantiateProvider( strategySelector, HIKARI_STRATEGY );
170161
}

hibernate-platform/hibernate-platform.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ dependencies {
2323
api project( ":hibernate-agroal" )
2424
api project( ":hibernate-c3p0" )
2525
api project( ":hibernate-hikaricp" )
26-
api project( ":hibernate-proxool" )
2726
api project( ":hibernate-vibur" )
2827

2928
api project( ":hibernate-jcache" )
@@ -59,7 +58,6 @@ dependencies {
5958
runtime libs.agroalPool
6059
runtime libs.c3p0
6160
runtime libs.hikaricp
62-
runtime libs.proxool
6361
runtime libs.vibur
6462

6563
runtime libs.jcache

hibernate-proxool/hibernate-proxool.gradle

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

0 commit comments

Comments
 (0)