diff --git a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc index b95033ca3d..2570de67d6 100644 --- a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc +++ b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc @@ -1062,23 +1062,11 @@ The property name defines the role (e.g. `allowed`) and the entity class name (e A String identifying the policy context whose PolicyConfiguration interface is to be returned. The value passed to this parameter must not be null. [[configurations-classloader]] -=== ClassLoaders properties +=== ClassLoaders property `*hibernate.classLoaders*`:: Used to define a `java.util.Collection` or the `ClassLoader` instance Hibernate should use for class-loading and resource-lookups. -`*hibernate.classLoader.application*`:: -Names the `ClassLoader` used to load user application classes. - -`*hibernate.classLoader.resources*`:: -Names the `ClassLoader` Hibernate should use to perform resource loading. - -`*hibernate.classLoader.hibernate*`:: -Names the `ClassLoader` responsible for loading Hibernate classes. By default, this is the `ClassLoader` that loaded this class. - -`*hibernate.classLoader.environment*`:: -Names the `ClassLoader` used when Hibernate is unable to locates classes on the `hibernate.classLoader.application` or `hibernate.classLoader.hibernate`. - [[configurations-bootstrap]] === Bootstrap properties diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java index 5eb17ab3f7..c28f2bccd2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java @@ -108,11 +108,6 @@ public class ClassLoaderServiceImpl implements ClassLoaderService { providedClassLoaders.addAll( classLoaders ); } - addIfSet( providedClassLoaders, AvailableSettings.APP_CLASSLOADER, configValues ); - addIfSet( providedClassLoaders, AvailableSettings.RESOURCES_CLASSLOADER, configValues ); - addIfSet( providedClassLoaders, AvailableSettings.HIBERNATE_CLASSLOADER, configValues ); - addIfSet( providedClassLoaders, AvailableSettings.ENVIRONMENT_CLASSLOADER, configValues ); - return new ClassLoaderServiceImpl( providedClassLoaders,TcclLookupPrecedence.AFTER ); } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java index f85d6ca494..230dccece8 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java @@ -234,41 +234,6 @@ public interface AvailableSettings { */ String TC_CLASSLOADER = "hibernate.classLoader.tccl_lookup_precedence"; - /** - * Names the {@link ClassLoader} used to load user application classes. - * @since 4.0 - * - * @deprecated Use {@link #CLASSLOADERS} instead - */ - @Deprecated - String APP_CLASSLOADER = "hibernate.classLoader.application"; - - /** - * Names the {@link ClassLoader} Hibernate should use to perform resource loading. - * @since 4.0 - * @deprecated Use {@link #CLASSLOADERS} instead - */ - @Deprecated - String RESOURCES_CLASSLOADER = "hibernate.classLoader.resources"; - - /** - * Names the {@link ClassLoader} responsible for loading Hibernate classes. By default this is - * the {@link ClassLoader} that loaded this class. - * @since 4.0 - * @deprecated Use {@link #CLASSLOADERS} instead - */ - @Deprecated - String HIBERNATE_CLASSLOADER = "hibernate.classLoader.hibernate"; - - /** - * Names the {@link ClassLoader} used when Hibernate is unable to locate classes on the - * {@link #APP_CLASSLOADER} or {@link #HIBERNATE_CLASSLOADER}. - * @since 4.0 - * @deprecated Use {@link #CLASSLOADERS} instead - */ - @Deprecated - String ENVIRONMENT_CLASSLOADER = "hibernate.classLoader.environment"; - /** * Setting that controls whether we seek out JPA "static metamodel" classes and populate them. Accepts * 3 values: