Skip to content

Commit

Permalink
HHH-18902 completely remove Proxool
Browse files Browse the repository at this point in the history
it has not been updated in 20 years!
  • Loading branch information
gavinking committed Dec 3, 2024
1 parent 724212b commit 90ff5e7
Show file tree
Hide file tree
Showing 23 changed files with 7 additions and 781 deletions.
12 changes: 0 additions & 12 deletions documentation/documentation.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ configurations {
agroal
c3p0
hikaricp
proxool
vibur

jcache
Expand All @@ -72,7 +71,6 @@ configurations {
extendsFrom agroal
extendsFrom c3p0
extendsFrom hikaricp
extendsFrom proxool
extendsFrom vibur
extendsFrom jcache
extendsFrom jpamodelgen
Expand Down Expand Up @@ -133,7 +131,6 @@ dependencies {
reportAggregation project(':hibernate-hikaricp')
reportAggregation project(':hibernate-jcache')
reportAggregation project(':hibernate-micrometer')
reportAggregation project(':hibernate-proxool')
reportAggregation project(':hibernate-spatial')
reportAggregation project(':hibernate-vibur')
reportAggregation project(':hibernate-ant')
Expand Down Expand Up @@ -163,9 +160,6 @@ dependencies {
hikaricp project( ':hibernate-hikaricp' )
javadocSources project( path: ':hibernate-hikaricp', configuration: 'javadocSources' )

proxool project( ':hibernate-proxool' )
javadocSources project( path: ':hibernate-proxool', configuration: 'javadocSources' )

vibur project( ':hibernate-vibur' )
javadocSources project( path: ':hibernate-vibur', configuration: 'javadocSources' )

Expand Down Expand Up @@ -565,12 +559,6 @@ settingsDocumentation {
description = "Settings related to integrating with the C3P0 Connection pool"
settingsClassName "org.hibernate.cfg.C3p0Settings"
}
proxool {
explicitPosition = 5
summary = "Proxool Connection Pool Settings"
description = "Settings related to integrating with the Proxool Connection pool"
settingsClassName "org.hibernate.cfg.ProxoolSettings"
}
transaction {
explicitPosition = 6
summary = "Transaction Environment Settings"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ transitive dependencies based on the features being used or not.
|hibernate-c3p0| Support for https://www.mchange.com/projects/c3p0/[C3P0] connection pooling
|hibernate-hikaricp| Support for https://github.com/brettwooldridge/HikariCP/[HikariCP] connection pooling
|hibernate-vibur| Support for https://www.vibur.org/[Vibur DBCP] connection pooling
|hibernate-proxool| Support for https://proxool.sourceforge.net/[Proxool] connection pooling
|hibernate-ucp| Support for https://docs.oracle.com/en/database/oracle/oracle-database/23/jjucp/intro.html[Universal Connection Pool] connection pooling
|hibernate-jcache| Integration with https://jcp.org/en/jsr/detail?id=107$$[JCache], allowing any compliant implementation as a second-level cache provider
|hibernate-graalvm| Experimental extension to make it easier to compile applications as a https://www.graalvm.org/[GraalVM] native image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ Hibernate will internally determine which `ConnectionProvider` to use based on t
1. If `hibernate.connection.provider_class` is set, it takes precedence
2. else if `hibernate.connection.datasource` is set -> <<database-connectionprovider-datasource>>
3. else if any setting prefixed by `hibernate.c3p0.` is set -> <<database-connectionprovider-c3p0>>
4. else if any setting prefixed by `hibernate.proxool.` is set -> <<database-connectionprovider-proxool>>
5. else if any setting prefixed by `hibernate.hikari.` is set -> <<database-connectionprovider-hikari>>
6. else if any setting prefixed by `hibernate.vibur.` is set -> <<database-connectionprovider-vibur>>
7. else if any setting prefixed by `hibernate.agroal.` is set -> <<database-connectionprovider-agroal>>
8. else if any setting prefixed by `hibernate.oracleucp.` is set -> <<database-connectionprovider-ucp>>
9. else if `hibernate.connection.url` is set -> <<database-connectionprovider-drivermanager>>
10. else -> <<database-connectionprovider-provided>>
4. else if any setting prefixed by `hibernate.hikari.` is set -> <<database-connectionprovider-hikari>>
5. else if any setting prefixed by `hibernate.vibur.` is set -> <<database-connectionprovider-vibur>>
6. else if any setting prefixed by `hibernate.agroal.` is set -> <<database-connectionprovider-agroal>>
7. else if any setting prefixed by `hibernate.oracleucp.` is set -> <<database-connectionprovider-ucp>>
8. else if `hibernate.connection.url` is set -> <<database-connectionprovider-drivermanager>>
9. else -> <<database-connectionprovider-provided>>

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

[[database-connectionprovider-proxool]]
=== Using Proxool

[IMPORTANT]
====
To use the Proxool integration, the application must include the `hibernate-proxool` module jar (as well as its dependencies) on the classpath.
====

Hibernate also provides support for applications to use https://proxool.sourceforge.net/[Proxool] connection pooling.

Transaction isolation of the Connections is managed by the `ConnectionProvider` itself. See <<database-connectionprovider-isolation>>.

[[database-connectionprovider-proxool-existing]]
==== Using existing Proxool pools

Controlled by the `hibernate.proxool.existing_pool` setting.
If set to true, this ConnectionProvider will use an already existing Proxool pool by alias as indicated by the `hibernate.proxool.pool_alias` setting.

[[database-connectionprovider-proxool-jaxp]]
==== Configuring Proxool via XML

The `hibernate.proxool.xml` setting names a Proxool configuration XML file to be loaded as a classpath resource and loaded by Proxool's JAXPConfigurator.
See https://proxool.sourceforge.net/configure.html[proxool configuration].
`hibernate.proxool.pool_alias` must be set to indicate which pool to use.

[[database-connectionprovider-proxool-properties]]
==== Configuring Proxool via Properties

The `hibernate.proxool.properties` setting names a Proxool configuration properties file to be loaded as a classpath resource and loaded by Proxool's `PropertyConfigurator`.
See https://proxool.sourceforge.net/configure.html[proxool configuration].
`hibernate.proxool.pool_alias` must be set to indicate which pool to use.

[[database-connectionprovider-hikari]]
=== Using HikariCP

Expand Down
17 changes: 0 additions & 17 deletions etc/hibernate.properties
Original file line number Diff line number Diff line change
Expand Up @@ -217,22 +217,6 @@ hibernate.connection.pool_size 1



##############################
### Proxool Connection Pool###
##############################

## Properties for external configuration of Proxool

hibernate.proxool.pool_alias pool1

## Only need one of the following

#hibernate.proxool.existing_pool true
#hibernate.proxool.xml proxool.xml
#hibernate.proxool.properties proxool.properties



#################################
### Plugin ConnectionProvider ###
#################################
Expand All @@ -242,7 +226,6 @@ hibernate.proxool.pool_alias pool1
#hibernate.connection.provider_class org.hibernate.connection.DriverManagerConnectionProvider
#hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider
#hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider
#hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider



Expand Down
17 changes: 0 additions & 17 deletions etc/hibernate.properties.template
Original file line number Diff line number Diff line change
Expand Up @@ -191,22 +191,6 @@ hibernate.connection.pool_size 1



##############################
### Proxool Connection Pool###
##############################

## Properties for external configuration of Proxool

hibernate.proxool.pool_alias pool1

## Only need one of the following

#hibernate.proxool.existing_pool true
#hibernate.proxool.xml proxool.xml
#hibernate.proxool.properties proxool.properties



#################################
### Plugin ConnectionProvider ###
#################################
Expand All @@ -217,7 +201,6 @@ hibernate.proxool.pool_alias pool1
#hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider
#hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider
#hibernate.connection.provider_class org.hibernate.connection.DBCPConnectionProvider
#hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @author Steve Ebersole
*/
public interface JdbcSettings extends C3p0Settings, ProxoolSettings, AgroalSettings, HikariCPSettings {
public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSettings {

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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import static org.hibernate.cfg.JdbcSettings.POOL_SIZE;
import static org.hibernate.cfg.JdbcSettings.URL;
import static org.hibernate.cfg.JdbcSettings.USER;
import static org.hibernate.cfg.ProxoolSettings.PROXOOL_CONFIG_PREFIX;
import static org.hibernate.cfg.SchemaToolingSettings.ENABLE_SYNONYMS;
import static org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentImpl.isMultiTenancyEnabled;
import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
Expand All @@ -66,11 +65,6 @@ public class ConnectionProviderInitiator implements StandardServiceInitiator<Con
*/
public static final String C3P0_STRATEGY = "c3p0";

/**
* The strategy for proxool connection pooling
*/
public static final String PROXOOL_STRATEGY = "proxool";

/**
* The strategy for hikari connection pooling
*/
Expand Down Expand Up @@ -162,9 +156,6 @@ private ConnectionProvider instantiateConnectionProvider(
else if ( hasConfiguration( configurationValues, C3P0_CONFIG_PREFIX ) ) {
return instantiateProvider( strategySelector, C3P0_STRATEGY );
}
else if (hasConfiguration( configurationValues, PROXOOL_CONFIG_PREFIX )) {
return instantiateProvider( strategySelector, PROXOOL_STRATEGY );
}
else if ( hasConfiguration( configurationValues, HIKARI_CONFIG_PREFIX ) ) {
return instantiateProvider( strategySelector, HIKARI_STRATEGY );
}
Expand Down
2 changes: 0 additions & 2 deletions hibernate-platform/hibernate-platform.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ dependencies {
api project( ":hibernate-agroal" )
api project( ":hibernate-c3p0" )
api project( ":hibernate-hikaricp" )
api project( ":hibernate-proxool" )
api project( ":hibernate-vibur" )

api project( ":hibernate-jcache" )
Expand Down Expand Up @@ -59,7 +58,6 @@ dependencies {
runtime libs.agroalPool
runtime libs.c3p0
runtime libs.hikaricp
runtime libs.proxool
runtime libs.vibur

runtime libs.jcache
Expand Down
28 changes: 0 additions & 28 deletions hibernate-proxool/hibernate-proxool.gradle

This file was deleted.

Loading

0 comments on commit 90ff5e7

Please sign in to comment.