Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-7556 - Clean up packages

This commit is contained in:
Steve Ebersole 2012-08-28 14:12:14 -05:00
parent d52a20a693
commit 4ad49a02c9
228 changed files with 1057 additions and 860 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -256,7 +256,7 @@ https://hibernate.onjira.com/browse/HHH/fixforversion/11223
** Task
* [HHH-6082] - Incorporate EntityManager documentation into main dev guide
* [HHH-6336] - Add TenantIdentifierResolver
* [HHH-6656] - Document org.hibernate.service.classloading.spi.ClassLoaderService
* [HHH-6656] - Document org.hibernate.boot.registry.classloading.spi.ClassLoaderService
* [HHH-6966] - Re apply HHH-6782
* [HHH-6985] - Change up tests for PostgreSQL LockMode issues
* [HHH-7011] - Document multi-tenancy

16
documentation/src/main/docbook/devguide/en-US/Database_Access.xml
View File

@ -32,9 +32,9 @@
<para>
Hibernate obtains JDBC connections as needed though the
<interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename> interface
<interfacename>ConnectionProvider</interfacename> interface
which is a service contract. Applications may also supply their own
<interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename> implementation
<interfacename>ConnectionProvider</interfacename> implementation
to define a custom approach for supplying connections to Hibernate (from a different connection pool
implementation, for example).
</para>
@ -232,7 +232,7 @@
</para>
<para>
You can define your own plugin strategy for obtaining JDBC connections by implementing the interface
<interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename> and specifying your custom
<interfacename>ConnectionProvider</interfacename> and specifying your custom
implementation with the <property>hibernate.connection.provider_class</property> property.
</para>
</section>
@ -386,22 +386,22 @@
<section>
<title>Dialect resolution</title>
<para>
Assuming a <interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename> has been
Assuming a <interfacename>ConnectionProvider</interfacename> has been
set up, Hibernate will attempt to automatically determine the Dialect to use based on the
<interfacename>java.sql.DatabaseMetaData</interfacename> reported by a
<interfacename>java.sql.Connection</interfacename> obtained from that
<interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename>.
<interfacename>ConnectionProvider</interfacename>.
</para>
<para>
This functionality is provided by a series of
<interfacename>org.hibernate.service.jdbc.dialect.spi.DialectResolver</interfacename> instances registered
<interfacename>org.hibernate.engine.jdbc.dialect.spi.DialectResolver</interfacename> instances registered
with Hibernate internally. Hibernate comes with a standard set of recognitions. If your application
requires extra Dialect resolution capabilities, it would simply register a custom implementation
of <interfacename>org.hibernate.service.jdbc.dialect.spi.DialectResolver</interfacename> as follows:
of <interfacename>org.hibernate.engine.jdbc.dialect.spi.DialectResolver</interfacename> as follows:
</para>
<!-- document an example using the service registry -->
<para>
Registered <interfacename>org.hibernate.service.jdbc.dialect.spi.DialectResolver</interfacename> are
Registered <interfacename>org.hibernate.engine.jdbc.dialect.spi.DialectResolver</interfacename> are
<emphasis>prepended</emphasis> to an internal list of resolvers, so they take precedence
before any already registered resolvers including the standard one.
</para>

10
documentation/src/main/docbook/devguide/en-US/chapters/multitenancy/Multi_Tenancy.xml
View File

@ -149,7 +149,7 @@
<para>
Correlates to the separate schema approach. It is an error to attempt to open a session without
a tenant identifier using this strategy. Additionally, a
<interfacename>org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider</interfacename>
<interfacename>MultiTenantConnectionProvider</interfacename>
must be specified.
</para>
</listitem>
@ -160,7 +160,7 @@
<para>
Correlates to the separate database approach. It is an error to attempt to open a session without
a tenant identifier using this strategy. Additionally, a
<interfacename>org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider</interfacename>
<interfacename>MultiTenantConnectionProvider</interfacename>
must be specified.
</para>
</listitem>
@ -182,7 +182,7 @@
<para>
When using either the DATABASE or SCHEMA approach, Hibernate needs to be able to obtain Connections
in a tenant specific manner. That is the role of the
<interfacename>org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider</interfacename>
<interfacename>MultiTenantConnectionProvider</interfacename>
contract. Application developers will need to provide an implementation of this
contract. Most of its methods are extremely self-explanatory. The only ones which might not be are
<methodname>getAnyConnection</methodname> and <methodname>releaseAnyConnection</methodname>. It is
@ -205,7 +205,7 @@
</listitem>
<listitem>
<para>
Passed directly to the <classname>org.hibernate.service.ServiceRegistryBuilder</classname>.
Passed directly to the <classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname>.
</para>
</listitem>
<listitem>
@ -213,7 +213,7 @@
If none of the above options match, but the settings do specify a
<property>hibernate.connection.datasource</property> value, Hibernate will assume it should
use the specific
<classname>org.hibernate.service.jdbc.connections.spi.DataSourceBasedMultiTenantConnectionProviderImpl</classname>
<classname>DataSourceBasedMultiTenantConnectionProviderImpl</classname>
implementation which works on a number of pretty reasonable assumptions when running inside of
an app server and using one <interfacename>javax.sql.DataSource</interfacename> per tenant.
See its javadocs for more details.

102
documentation/src/main/docbook/devguide/en-US/chapters/services/Services.xml
View File

@ -81,7 +81,7 @@
same registry as well as any parent registries.
</para>
<para>
Use <classname>org.hibernate.service.ServiceRegistryBuilder</classname> to build a
Use <classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname> to build a
<interfacename>org.hibernate.service.ServiceRegistry</interfacename> instance.
</para>
</section>
@ -121,7 +121,7 @@
</section>
<section xml:id="services-ConfigurationService">
<title><interfacename>org.hibernate.service.config.spi.ConfigurationService</interfacename></title>
<title><interfacename>org.hibernate.engine.config.spi.ConfigurationService</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@ -137,7 +137,7 @@
<term>Initiator</term>
<listitem>
<para>
<classname>org.hibernate.service.config.internal.ConfigurationServiceInitiator</classname>
<classname>org.hibernate.engine.config.internal.ConfigurationServiceInitiator</classname>
</para>
</listitem>
</varlistentry>
@ -145,7 +145,7 @@
<term>Implementations</term>
<listitem>
<para>
<classname>org.hibernate.service.config.internal.ConfigurationServiceImpl</classname>
<classname>org.hibernate.engine.config.internal.ConfigurationServiceImpl</classname>
</para>
</listitem>
</varlistentry>
@ -153,7 +153,7 @@
</section>
<section xml:id="services-ConnectionProvider">
<title><interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename></title>
<title><interfacename>ConnectionProvider</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@ -168,7 +168,7 @@
<term>Initiator</term>
<listitem>
<para>
<classname>org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator</classname>
<classname>ConnectionProviderInitiator</classname>
</para>
</listitem>
</varlistentry>
@ -184,14 +184,14 @@
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl</classname> -
<classname>DatasourceConnectionProviderImpl</classname> -
provides connection managed delegated to a
<interfacename>javax.sql.DataSource</interfacename>
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl</classname> -
<classname>DriverManagerConnectionProviderImpl</classname> -
provides rudimentary connection pooling based on simple custom pool. Note intended
production use!
</para>
@ -204,7 +204,7 @@
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jdbc.connections.internal.UserSuppliedConnectionProviderImpl</classname> -
<classname>UserSuppliedConnectionProviderImpl</classname> -
Provides no connection support. Indicates the user will supply connections to Hibernate directly.
Not recommended for use.
</para>
@ -216,7 +216,7 @@
</section>
<section xml:id="services-DialectFactory">
<title><interfacename>org.hibernate.service.jdbc.dialect.spi.DialectFactory</interfacename></title>
<title><interfacename>org.hibernate.engine.jdbc.dialect.spi.DialectFactory</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@ -233,7 +233,7 @@
<term>Initiator</term>
<listitem>
<para>
<classname>org.hibernate.service.jdbc.dialect.internal.DialectFactoryInitiator</classname>
<classname>org.hibernate.engine.jdbc.dialect.internal.DialectFactoryInitiator</classname>
</para>
</listitem>
</varlistentry>
@ -241,7 +241,7 @@
<term>Implementations</term>
<listitem>
<para>
<classname>org.hibernate.service.jdbc.dialect.internal.DialectFactoryImpl</classname>
<classname>org.hibernate.engine.jdbc.dialect.internal.DialectFactoryImpl</classname>
</para>
</listitem>
</varlistentry>
@ -249,7 +249,7 @@
</section>
<section xml:id="services-DialectResolver">
<title><interfacename>org.hibernate.service.jdbc.dialect.spi.DialectResolver</interfacename></title>
<title><interfacename>org.hibernate.engine.jdbc.dialect.spi.DialectResolver</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@ -261,8 +261,8 @@
<para>
The standard resolver implementation acts as a chain, delegating to a series of individual
resolvers. The standard Hibernate resolution behavior is contained in
<classname>org.hibernate.service.jdbc.dialect.internal.StandardDialectResolver</classname>.
<classname>org.hibernate.service.jdbc.dialect.internal.DialectResolverInitiator</classname>
<classname>org.hibernate.engine.jdbc.dialect.internal.StandardDialectResolver</classname>.
<classname>org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator</classname>
also consults with the <property>hibernate.dialect_resolvers</property> setting for any
custom resolvers.
</para>
@ -272,7 +272,7 @@
<term>Initiator</term>
<listitem>
<para>
<classname>org.hibernate.service.jdbc.dialect.internal.DialectResolverInitiator</classname>
<classname>org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator</classname>
</para>
</listitem>
</varlistentry>
@ -280,7 +280,7 @@
<term>Implementations</term>
<listitem>
<para>
<classname>org.hibernate.service.jdbc.dialect.internal.DialectResolverSet</classname>
<classname>org.hibernate.engine.jdbc.dialect.internal.DialectResolverSet</classname>
</para>
</listitem>
</varlistentry>
@ -319,7 +319,7 @@
</section>
<section xml:id="services-JmxService">
<title><interfacename>org.hibernate.service.jmx.spi.JmxService</interfacename></title>
<title><interfacename>org.hibernate.jmx.spi.JmxService</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@ -333,7 +333,7 @@
<term>Initiator</term>
<listitem>
<para>
<classname>org.hibernate.service.jmx.internal.JmxServiceInitiator</classname>
<classname>org.hibernate.jmx.internal.JmxServiceInitiator</classname>
</para>
</listitem>
</varlistentry>
@ -343,13 +343,13 @@
<itemizedlist>
<listitem>
<para>
<classname>org.hibernate.service.jmx.internal.DisabledJmxServiceImpl</classname> -
<classname>org.hibernate.jmx.internal.DisabledJmxServiceImpl</classname> -
A no-op implementation when JMX functionality is disabled.
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jmx.internal.JmxServiceImpl</classname> -
<classname>org.hibernate.jmx.internal.JmxServiceImpl</classname> -
Standard implementation of JMX handling
</para>
</listitem>
@ -360,7 +360,7 @@
</section>
<section xml:id="services-JndiService">
<title><interfacename>org.hibernate.service.jndi.spi.JndiService</interfacename></title>
<title><interfacename>org.hibernate.engine.jndi.spi.JndiService</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@ -374,7 +374,7 @@
<term>Initiator</term>
<listitem>
<para>
<classname>org.hibernate.service.jndi.internal.JndiServiceInitiator</classname>
<classname>org.hibernate.engine.jndi.internal.JndiServiceInitiator</classname>
</para>
</listitem>
</varlistentry>
@ -382,7 +382,7 @@
<term>Implementations</term>
<listitem>
<para>
<classname>org.hibernate.service.jndi.internal.JndiServiceImpl</classname>
<classname>org.hibernate.engine.jndi.internal.JndiServiceImpl</classname>
</para>
</listitem>
</varlistentry>
@ -390,7 +390,7 @@
</section>
<section xml:id="services-JtaPlatform">
<title><interfacename>org.hibernate.service.jta.platform.spi.JtaPlatform</interfacename></title>
<title><interfacename>org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@ -404,7 +404,7 @@
<term>Initiator</term>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.JtaPlatformInitiator</classname>
<classname>org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator</classname>
</para>
<important>
<para>
@ -423,81 +423,81 @@
<itemizedlist>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.BitronixJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.BitronixJtaPlatform</classname> -
Integration with the Bitronix stand-alone transaction manager.
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.BorlandEnterpriseServerJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.BorlandEnterpriseServerJtaPlatform</classname> -
Integration with the transaction manager as deployed within a Borland Enterprise Server
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.JBossAppServerJtaPlatform</classname> -
Integration with the transaction manager as deployed within a JBoss Application Server
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform</classname> -
Integration with the JBoss Transactions stand-alone transaction manager
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.JOTMJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.JOTMJtaPlatform</classname> -
Integration with the JOTM stand-alone transaction manager
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.JOnASJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.JOnASJtaPlatform</classname> -
Integration with the JOnAS transaction manager.
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.JRun4JtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.JRun4JtaPlatform</classname> -
Integration with the transaction manager as deployed in a JRun 4 application server.
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.NoJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform</classname> -
No-op version when no JTA set up is configured
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.OC4JJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.OC4JJtaPlatform</classname> -
Integration with transaction manager as deployed in an OC4J (Oracle) application
server.
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.OrionJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.OrionJtaPlatform</classname> -
Integration with transaction manager as deployed in an Orion application server.
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.ResinJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.ResinJtaPlatform</classname> -
Integration with transaction manager as deployed in a Resin application server.
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.SunOneJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.SunOneJtaPlatform</classname> -
Integration with transaction manager as deployed in a Sun ONE (7 and above)
application server.
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.TransactionManagerLookupBridge</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.TransactionManagerLookupBridge</classname> -
Provides a bridge to legacy (and deprecated)
<interfacename>org.hibernate.transaction.TransactionManagerLookup</interfacename>
implementations
@ -505,21 +505,21 @@
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.WebSphereExtendedJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform</classname> -
Integration with transaction manager as deployed in a WebSphere Application Server
(6 and above).
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.WebSphereJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform</classname> -
Integration with transaction manager as deployed in a WebSphere Application Server
(4, 5.0 and 5.1).
</para>
</listitem>
<listitem>
<para>
<classname>org.hibernate.service.jta.platform.internal.WeblogicJtaPlatform</classname> -
<classname>org.hibernate.engine.transaction.jta.platform.internal.WeblogicJtaPlatform</classname> -
Integration with transaction manager as deployed in a Weblogic application server.
</para>
</listitem>
@ -530,7 +530,7 @@
</section>
<section xml:id="services-MultiTenantConnectionProvider">
<title><interfacename>org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider</interfacename></title>
<title><interfacename>MultiTenantConnectionProvider</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@ -875,27 +875,27 @@
Once a <interfacename>org.hibernate.service.ServiceRegistry</interfacename> is built it is considered
immutable; the services themselves might accept re-configuration, but immutability here means
adding/replacing services. So another role provided by the
<classname>org.hibernate.service.ServiceRegistryBuilder</classname> is to allow tweaking of the services
<classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname> is to allow tweaking of the services
that will be contained in the <interfacename>org.hibernate.service.ServiceRegistry</interfacename>
generated from it.
</para>
<para>
There are 2 means to tell a <classname>org.hibernate.service.ServiceRegistryBuilder</classname> about
There are 2 means to tell a <classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname> about
custom services.
</para>
<itemizedlist>
<listitem>
<para>
Implement a <interfacename>org.hibernate.service.spi.BasicServiceInitiator</interfacename> class
Implement a <interfacename>org.hibernate.boot.registry.StandardServiceInitiator</interfacename> class
to control on-demand construction of the service class and add it to the
<classname>org.hibernate.service.ServiceRegistryBuilder</classname> via its
<classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname> via its
<methodname>addInitiator</methodname> method.
</para>
</listitem>
<listitem>
<para>
Just instantiate the service class and add it to the
<classname>org.hibernate.service.ServiceRegistryBuilder</classname> via its
<classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname> via its
<methodname>addService</methodname> method.
</para>
</listitem>
@ -921,7 +921,7 @@
<para>
Instances of boot-strap registries are built using the
<classname>org.hibernate.service.BootstrapServiceRegistryBuilder</classname> class.
<classname>org.hibernate.boot.registry.BootstrapServiceRegistryBuilder</classname> class.
</para>
<example xml:id="BootstrapServiceRegistryBuilder-example">
@ -932,7 +932,7 @@
<section id="services-registry-bootstrap-services">
<title>Bootstrap registry services</title>
<section id="services-ClassLoaderService">
<title><interfacename>org.hibernate.service.classloading.spi.ClassLoaderService</interfacename></title>
<title><interfacename>org.hibernate.boot.registry.classloading.spi.ClassLoaderService</interfacename></title>
<para>
Hibernate needs to interact with ClassLoaders. However, the manner in which Hibernate
(or any library) should interact with ClassLoaders varies based on the runtime environment
@ -986,7 +986,7 @@
<para>
This service focuses on the discovery aspect. It leverages the standard Java
<classname>java.util.ServiceLoader</classname> capability provided by the
<interfacename>org.hibernate.service.classloading.spi.ClassLoaderService</interfacename>
<interfacename>org.hibernate.boot.registry.classloading.spi.ClassLoaderService</interfacename>
in order to discover implementations of the
<interfacename>org.hibernate.integrator.spi.Integrator</interfacename> contract.
Integrators would simply define a file named

4
documentation/src/main/docbook/devguide/en-US/chapters/transactions/Transactions.xml
View File

@ -95,7 +95,7 @@
<para>
JTA-based transaction approach which leverages the
<interfacename>javax.transaction.UserTransaction</interfacename> interface as obtained from
<interfacename>org.hibernate.service.jta.platform.spi.JtaPlatform</interfacename> API. This approach
<interfacename>org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform</interfacename> API. This approach
is represented by the
<classname>org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory</classname> class.
</para>
@ -111,7 +111,7 @@
<para>
Another JTA-based transaction approach which leverages the JTA
<interfacename>javax.transaction.TransactionManager</interfacename> interface as obtained from
<interfacename>org.hibernate.service.jta.platform.spi.JtaPlatform</interfacename> API. This approach
<interfacename>org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform</interfacename> API. This approach
is represented by the
<classname>org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory</classname> class. In
an actual JEE CMT environment, access to the

7
hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java
View File

@ -35,11 +35,12 @@ import org.jboss.logging.Logger;
import org.hibernate.HibernateException;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.UnknownUnwrapTypeException;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.classloading.spi.ClassLoadingException;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;

2
hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java
View File

@ -32,7 +32,7 @@ import org.junit.Test;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;

2
hibernate-core/src/main/java/org/hibernate/SessionFactory.java
View File

@ -71,7 +71,7 @@ public interface SessionFactory extends Referenceable, Serializable {
* Open a {@link Session}.
* <p/>
* JDBC {@link Connection connection(s} will be obtained from the
* configured {@link org.hibernate.service.jdbc.connections.spi.ConnectionProvider} as needed
* configured {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} as needed
* to perform requested work.
*
* @return The created session.

35
hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistry.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2012, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.boot.registry;
import org.hibernate.service.ServiceRegistry;
/**
* Specialization of the {@link org.hibernate.service.ServiceRegistry} contract mainly to make the
* {@link StandardServiceRegistryBuilder#StandardServiceRegistryBuilder(BootstrapServiceRegistry)} signature type-safe
*
* @author Steve Ebersole
*/
public interface BootstrapServiceRegistry extends ServiceRegistry {
}

152
hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java Normal file
View File

@ -0,0 +1,152 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2012, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.boot.registry;
import java.util.LinkedHashSet;
import org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl;
import org.hibernate.integrator.internal.IntegratorServiceImpl;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
import org.hibernate.boot.registry.selector.internal.StrategySelectorBuilder;
/**
* Builder for bootstrap {@link org.hibernate.service.ServiceRegistry} instances.
*
* @author Steve Ebersole
*
* @see BootstrapServiceRegistryImpl
* @see StandardServiceRegistryBuilder#StandardServiceRegistryBuilder(org.hibernate.boot.registry.BootstrapServiceRegistry)
*/
public class BootstrapServiceRegistryBuilder {
private final LinkedHashSet<Integrator> providedIntegrators = new LinkedHashSet<Integrator>();
private ClassLoader applicationClassLoader;
private ClassLoader resourcesClassLoader;
private ClassLoader hibernateClassLoader;
private ClassLoader environmentClassLoader;
private StrategySelectorBuilder strategySelectorBuilder = new StrategySelectorBuilder();
/**
* Add an {@link Integrator} to be applied to the bootstrap registry.
*
* @param integrator The integrator to add.
* @return {@code this}, for method chaining
*/
public BootstrapServiceRegistryBuilder with(Integrator integrator) {
providedIntegrators.add( integrator );
return this;
}
/**
* Applies the specified {@link ClassLoader} as the application class loader for the bootstrap registry
*
* @param classLoader The class loader to use
* @return {@code this}, for method chaining
*/
@SuppressWarnings( {"UnusedDeclaration"})
public BootstrapServiceRegistryBuilder withApplicationClassLoader(ClassLoader classLoader) {
this.applicationClassLoader = classLoader;
return this;
}
/**
* Applies the specified {@link ClassLoader} as the resource class loader for the bootstrap registry
*
* @param classLoader The class loader to use
* @return {@code this}, for method chaining
*/
@SuppressWarnings( {"UnusedDeclaration"})
public BootstrapServiceRegistryBuilder withResourceClassLoader(ClassLoader classLoader) {
this.resourcesClassLoader = classLoader;
return this;
}
/**
* Applies the specified {@link ClassLoader} as the Hibernate class loader for the bootstrap registry
*
* @param classLoader The class loader to use
* @return {@code this}, for method chaining
*/
@SuppressWarnings( {"UnusedDeclaration"})
public BootstrapServiceRegistryBuilder withHibernateClassLoader(ClassLoader classLoader) {
this.hibernateClassLoader = classLoader;
return this;
}
/**
* Applies the specified {@link ClassLoader} as the environment (or system) class loader for the bootstrap registry
*
* @param classLoader The class loader to use
* @return {@code this}, for method chaining
*/
@SuppressWarnings( {"UnusedDeclaration"})
public BootstrapServiceRegistryBuilder withEnvironmentClassLoader(ClassLoader classLoader) {
this.environmentClassLoader = classLoader;
return this;
}
/**
* Applies a named strategy implementation to the bootstrap registry
*
* @param strategy The strategy
* @param name The registered name
* @param implementation The strategy implementation Class
*
* @return {@code this}, for method chaining
*
* @see org.hibernate.boot.registry.selector.spi.StrategySelector#registerStrategyImplementor(Class, String, Class)
*/
@SuppressWarnings( {"UnusedDeclaration"})
public <T> BootstrapServiceRegistryBuilder withStrategySelector(Class<T> strategy, String name, Class<? extends T> implementation) {
this.strategySelectorBuilder.addCustomRegistration( strategy, name, implementation );
return this;
}
/**
* Build the bootstrap registry.
*
* @return The built bootstrap registry
*/
public BootstrapServiceRegistry build() {
final ClassLoaderServiceImpl classLoaderService = new ClassLoaderServiceImpl(
applicationClassLoader,
resourcesClassLoader,
hibernateClassLoader,
environmentClassLoader
);
final IntegratorServiceImpl integratorService = new IntegratorServiceImpl(
providedIntegrators,
classLoaderService
);
return new BootstrapServiceRegistryImpl(
classLoaderService,
strategySelectorBuilder.buildSelector( classLoaderService ),
integratorService
);
}
}

6
hibernate-core/src/main/java/org/hibernate/service/spi/BasicServiceInitiator.java → hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceInitiator.java
View File

@ -21,18 +21,20 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.spi;
package org.hibernate.boot.registry;
import java.util.Map;
import org.hibernate.service.Service;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* Contract for an initiator of services that target the standard {@link org.hibernate.service.ServiceRegistry}
*
* @author Steve Ebersole
*/
public interface BasicServiceInitiator<R extends Service> extends ServiceInitiator<R> {
public interface StandardServiceInitiator<R extends Service> extends ServiceInitiator<R> {
/**
* Initiates the managed service.
*

224
hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java Normal file
View File

@ -0,0 +1,224 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2012, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.boot.registry;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.hibernate.cfg.Environment;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.integrator.spi.IntegratorService;
import org.hibernate.integrator.spi.ServiceContributingIntegrator;
import org.hibernate.internal.jaxb.cfg.JaxbHibernateConfiguration;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl;
import org.hibernate.service.ConfigLoader;
import org.hibernate.service.Service;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.StandardServiceInitiators;
import org.hibernate.service.internal.ProvidedService;
import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
/**
* Builder for standard {@link org.hibernate.service.ServiceRegistry} instances.
*
* @author Steve Ebersole
*
* @see StandardServiceRegistryImpl
* @see org.hibernate.boot.registry.BootstrapServiceRegistryBuilder
*/
public class StandardServiceRegistryBuilder {
public static final String DEFAULT_CFG_RESOURCE_NAME = "hibernate.cfg.xml";
private final Map settings;
private final List<StandardServiceInitiator> initiators = standardInitiatorList();
private final List<ProvidedService> providedServices = new ArrayList<ProvidedService>();
private final BootstrapServiceRegistry bootstrapServiceRegistry;
private final ConfigLoader configLoader;
/**
* Create a default builder
*/
public StandardServiceRegistryBuilder() {
this( new BootstrapServiceRegistryImpl() );
}
/**
* Create a builder with the specified bootstrap services.
*
* @param bootstrapServiceRegistry Provided bootstrap registry to use.
*/
public StandardServiceRegistryBuilder(BootstrapServiceRegistry bootstrapServiceRegistry) {
this.settings = Environment.getProperties();
this.bootstrapServiceRegistry = bootstrapServiceRegistry;
this.configLoader = new ConfigLoader( bootstrapServiceRegistry );
}
/**
* Used from the {@link #initiators} variable initializer
*
* @return List of standard initiators
*/
private static List<StandardServiceInitiator> standardInitiatorList() {
final List<StandardServiceInitiator> initiators = new ArrayList<StandardServiceInitiator>();
initiators.addAll( StandardServiceInitiators.LIST );
return initiators;
}
/**
* Read settings from a {@link Properties} file. Differs from {@link #configure()} and {@link #configure(String)}
* in that here we read a {@link Properties} file while for {@link #configure} we read the XML variant.
*
* @param resourceName The name by which to perform a resource look up for the properties file.
*
* @return this, for method chaining
*
* @see #configure()
* @see #configure(String)
*/
@SuppressWarnings( {"unchecked"})
public StandardServiceRegistryBuilder loadProperties(String resourceName) {
settings.putAll( configLoader.loadProperties( resourceName ) );
return this;
}
/**
* Read setting information from an XML file using the standard resource location
*
* @return this, for method chaining
*
* @see #DEFAULT_CFG_RESOURCE_NAME
* @see #configure(String)
* @see #loadProperties(String)
*/
public StandardServiceRegistryBuilder configure() {
return configure( DEFAULT_CFG_RESOURCE_NAME );
}
/**
* Read setting information from an XML file using the named resource location
*
* @param resourceName The named resource
*
* @return this, for method chaining
*
* @see #loadProperties(String)
*/
@SuppressWarnings( {"unchecked"})
public StandardServiceRegistryBuilder configure(String resourceName) {
JaxbHibernateConfiguration configurationElement = configLoader.loadConfigXmlResource( resourceName );
for ( JaxbHibernateConfiguration.JaxbSessionFactory.JaxbProperty xmlProperty : configurationElement.getSessionFactory().getProperty() ) {
settings.put( xmlProperty.getName(), xmlProperty.getValue() );
}
return this;
}
/**
* Apply a setting value
*
* @param settingName The name of the setting
* @param value The value to use.
*
* @return this, for method chaining
*/
@SuppressWarnings( {"unchecked", "UnusedDeclaration"})
public StandardServiceRegistryBuilder applySetting(String settingName, Object value) {
settings.put( settingName, value );
return this;
}
/**
* Apply a groups of setting values
*
* @param settings The incoming settings to apply
*
* @return this, for method chaining
*/
@SuppressWarnings( {"unchecked", "UnusedDeclaration"})
public StandardServiceRegistryBuilder applySettings(Map settings) {
this.settings.putAll( settings );
return this;
}
/**
* Adds a service initiator.
*
* @param initiator The initiator to be added
*
* @return this, for method chaining
*/
@SuppressWarnings( {"UnusedDeclaration"})
public StandardServiceRegistryBuilder addInitiator(StandardServiceInitiator initiator) {
initiators.add( initiator );
return this;
}
/**
* Adds a user-provided service
*
* @param serviceRole The role of the service being added
* @param service The service implementation
*
* @return this, for method chaining
*/
@SuppressWarnings( {"unchecked"})
public StandardServiceRegistryBuilder addService(final Class serviceRole, final Service service) {
providedServices.add( new ProvidedService( serviceRole, service ) );
return this;
}
/**
* Build the service registry accounting for all settings and service initiators and services.
*
* @return The built service registry
*/
public ServiceRegistry buildServiceRegistry() {
Map<?,?> settingsCopy = new HashMap();
settingsCopy.putAll( settings );
Environment.verifyProperties( settingsCopy );
ConfigurationHelper.resolvePlaceHolders( settingsCopy );
for ( Integrator integrator : bootstrapServiceRegistry.getService( IntegratorService.class ).getIntegrators() ) {
if ( ServiceContributingIntegrator.class.isInstance( integrator ) ) {
ServiceContributingIntegrator.class.cast( integrator ).prepareServices( this );
}
}
return new StandardServiceRegistryImpl( bootstrapServiceRegistry, initiators, providedServices, settingsCopy );
}
/**
* Destroy a service registry. Applications should only destroy registries they have explicitly created.
*
* @param serviceRegistry The registry to be closed.
*/
public static void destroy(ServiceRegistry serviceRegistry) {
( (StandardServiceRegistryImpl) serviceRegistry ).destroy();
}
}

6
hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceImpl.java → hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.classloading.internal;
package org.hibernate.boot.registry.classloading.internal;
import java.io.IOException;
import java.io.InputStream;
@ -38,8 +38,8 @@ import java.util.ServiceLoader;
import org.jboss.logging.Logger;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.classloading.spi.ClassLoadingException;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
/**
* Standard implementation of the service for interacting with class loaders

2
hibernate-core/src/main/java/org/hibernate/service/classloading/spi/ClassLoaderService.java → hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoaderService.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.classloading.spi;
package org.hibernate.boot.registry.classloading.spi;
import java.io.InputStream;
import java.net.URL;

2
hibernate-core/src/main/java/org/hibernate/service/classloading/spi/ClassLoadingException.java → hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoadingException.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.classloading.spi;
package org.hibernate.boot.registry.classloading.spi;
import org.hibernate.HibernateException;
/**

19
hibernate-core/src/main/java/org/hibernate/service/internal/BootstrapServiceRegistryImpl.java → hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java
View File

@ -1,7 +1,7 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2011, Red Hat Inc. or third-party contributors as
* Copyright (c) 2012, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
@ -21,20 +21,20 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.internal;
package org.hibernate.boot.registry.internal;
import java.util.LinkedHashSet;
import org.hibernate.integrator.internal.IntegratorServiceImpl;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.integrator.spi.IntegratorService;
import org.hibernate.service.BootstrapServiceRegistry;
import org.hibernate.boot.registry.BootstrapServiceRegistry;
import org.hibernate.service.Service;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.selector.internal.StrategySelectorImpl;
import org.hibernate.service.selector.spi.StrategySelector;
import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.selector.internal.StrategySelectorImpl;
import org.hibernate.boot.registry.selector.spi.StrategySelector;
import org.hibernate.service.spi.ServiceBinding;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceInitiator;
@ -46,6 +46,11 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
* <li>{@link IntegratorService}</li>
* </ul>
*
* IMPL NOTE : Currently implements the deprecated {@link org.hibernate.service.BootstrapServiceRegistry} contract
* so that the registry returned from the builder works on the deprecated sense. Once
* {@link org.hibernate.service.BootstrapServiceRegistry} goes away, this should be updated to instead implement
* {@link org.hibernate.boot.registry.BootstrapServiceRegistry}.
*
* @author Steve Ebersole
*/
public class BootstrapServiceRegistryImpl

12
hibernate-core/src/main/java/org/hibernate/service/internal/StandardServiceRegistryImpl.java → hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java
View File

@ -21,15 +21,17 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.internal;
package org.hibernate.boot.registry.internal;
import java.util.List;
import java.util.Map;
import org.hibernate.service.BootstrapServiceRegistry;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.boot.registry.BootstrapServiceRegistry;
import org.hibernate.service.Service;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.service.internal.AbstractServiceRegistryImpl;
import org.hibernate.service.internal.ProvidedService;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.ServiceBinding;
import org.hibernate.service.spi.ServiceInitiator;
@ -45,7 +47,7 @@ public class StandardServiceRegistryImpl extends AbstractServiceRegistryImpl imp
@SuppressWarnings( {"unchecked"})
public StandardServiceRegistryImpl(
BootstrapServiceRegistry bootstrapServiceRegistry,
List<BasicServiceInitiator> serviceInitiators,
List<StandardServiceInitiator> serviceInitiators,
List<ProvidedService> providedServices,
Map<?, ?> configurationValues) {
super( bootstrapServiceRegistry );
@ -66,7 +68,7 @@ public class StandardServiceRegistryImpl extends AbstractServiceRegistryImpl imp
@Override
public <R extends Service> R initiateService(ServiceInitiator<R> serviceInitiator) {
// todo : add check/error for unexpected initiator types?
return ( (BasicServiceInitiator<R>) serviceInitiator ).initiateService( configurationValues, this );
return ( (StandardServiceInitiator<R>) serviceInitiator ).initiateService( configurationValues, this );
}
@Override

8
hibernate-core/src/main/java/org/hibernate/service/selector/internal/StrategySelectorBuilder.java → hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.selector.internal;
package org.hibernate.boot.registry.selector.internal;
import java.util.ArrayList;
import java.util.List;
@ -32,9 +32,9 @@ import org.hibernate.engine.transaction.internal.jdbc.JdbcTransactionFactory;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory;
import org.hibernate.engine.transaction.spi.TransactionFactory;
import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
import org.hibernate.service.selector.spi.StrategySelectionException;
import org.hibernate.service.selector.spi.StrategySelector;
import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
import org.hibernate.boot.registry.selector.spi.StrategySelectionException;
import org.hibernate.boot.registry.selector.spi.StrategySelector;
/**
* @author Steve Ebersole

10
hibernate-core/src/main/java/org/hibernate/service/selector/internal/StrategySelectorImpl.java → hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.selector.internal;
package org.hibernate.boot.registry.selector.internal;
import java.util.Iterator;
import java.util.Map;
@ -29,10 +29,10 @@ import java.util.concurrent.ConcurrentHashMap;
import org.jboss.logging.Logger;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.classloading.spi.ClassLoadingException;
import org.hibernate.service.selector.spi.StrategySelectionException;
import org.hibernate.service.selector.spi.StrategySelector;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
import org.hibernate.boot.registry.selector.spi.StrategySelectionException;
import org.hibernate.boot.registry.selector.spi.StrategySelector;
/**
* @author Steve Ebersole

1
hibernate-core/src/main/java/org/hibernate/boot/registry/selector/package-info.java Normal file
View File

@ -0,0 +1 @@
package org.hibernate.boot.registry.selector;

2
hibernate-core/src/main/java/org/hibernate/service/selector/spi/StrategySelectionException.java → hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelectionException.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.selector.spi;
package org.hibernate.boot.registry.selector.spi;
import org.hibernate.HibernateException;

2
hibernate-core/src/main/java/org/hibernate/service/selector/spi/StrategySelector.java → hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelector.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.selector.spi;
package org.hibernate.boot.registry.selector.spi;
import org.hibernate.service.Service;

6
hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java vendored
View File

@ -25,9 +25,9 @@ package org.hibernate.cache.internal;
import java.util.Map;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.cache.spi.RegionFactory;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceRegistryImplementor;
@ -36,7 +36,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
*
* @author Hardy Ferentschik
*/
public class RegionFactoryInitiator implements BasicServiceInitiator<RegionFactory> {
public class RegionFactoryInitiator implements StandardServiceInitiator<RegionFactory> {
public static final RegionFactoryInitiator INSTANCE = new RegionFactoryInitiator();
/**

22
hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
View File

@ -44,10 +44,10 @@ public interface AvailableSettings {
public static final String SESSION_FACTORY_NAME_IS_JNDI = "hibernate.session_factory_name_is_jndi";
/**
* Names the {@link org.hibernate.service.jdbc.connections.spi.ConnectionProvider} to use for obtaining
* Names the {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} to use for obtaining
* JDBC connections. Can either reference an instance of
* {@link org.hibernate.service.jdbc.connections.spi.ConnectionProvider} or a {@link Class} or {@link String}
* reference to the {@link org.hibernate.service.jdbc.connections.spi.ConnectionProvider} implementation
* {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} or a {@link Class} or {@link String}
* reference to the {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} implementation
* class.
*/
public static final String CONNECTION_PROVIDER ="hibernate.connection.provider_class";
@ -64,7 +64,7 @@ public interface AvailableSettings {
/**
* Names the connection user. This might mean one of 2 things in out-of-the-box Hibernate
* {@link org.hibernate.service.jdbc.connections.spi.ConnectionProvider}: <ul>
* {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider}: <ul>
* <li>The username used to pass along to creating the JDBC connection</li>
* <li>The username used to obtain a JDBC connection from a data source</li>
* </ul>
@ -129,8 +129,8 @@ public interface AvailableSettings {
public static final String DIALECT ="hibernate.dialect";
/**
* Names any additional {@link org.hibernate.service.jdbc.dialect.spi.DialectResolver} implementations to
* register with the standard {@link org.hibernate.service.jdbc.dialect.spi.DialectFactory}.
* Names any additional {@link org.hibernate.engine.jdbc.dialect.spi.DialectResolver} implementations to
* register with the standard {@link org.hibernate.engine.jdbc.dialect.spi.DialectFactory}.
*/
public static final String DIALECT_RESOLVERS = "hibernate.dialect_resolvers";
@ -275,9 +275,9 @@ public interface AvailableSettings {
public static final String TRANSACTION_STRATEGY = "hibernate.transaction.factory_class";
/**
* Names the {@link org.hibernate.service.jta.platform.spi.JtaPlatform} implementation to use for integrating
* with {@literal JTA} systems. Can reference either a {@link org.hibernate.service.jta.platform.spi.JtaPlatform}
* instance or the name of the {@link org.hibernate.service.jta.platform.spi.JtaPlatform} implementation class
* Names the {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation to use for integrating
* with {@literal JTA} systems. Can reference either a {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform}
* instance or the name of the {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation class
* @since 4.0
*/
public static final String JTA_PLATFORM = "hibernate.transaction.jta.platform";
@ -570,9 +570,9 @@ public interface AvailableSettings {
public static final String MULTI_TENANT = "hibernate.multiTenancy";
/**
* Names a {@link org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider} implementation to
* Names a {@link org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider} implementation to
* use. As MultiTenantConnectionProvider is also a service, can be configured directly through the
* {@link org.hibernate.service.ServiceRegistryBuilder}
* {@link org.hibernate.boot.registry.StandardServiceRegistryBuilder}
*
* @since 4.1
*/

8
hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
View File

@ -81,6 +81,7 @@ import org.hibernate.annotations.common.reflection.MetadataProviderInjector;
import org.hibernate.annotations.common.reflection.ReflectionManager;
import org.hibernate.annotations.common.reflection.XClass;
import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.annotations.reflection.JPAMetadataProvider;
import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
import org.hibernate.dialect.Dialect;
@ -136,8 +137,7 @@ import org.hibernate.mapping.UniqueKey;
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.secure.internal.JACCConfiguration;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.hibernate.tool.hbm2ddl.IndexMetadata;
import org.hibernate.tool.hbm2ddl.TableMetadata;
@ -163,7 +163,7 @@ import org.hibernate.usertype.UserType;
* A new <tt>Configuration</tt> will use the properties specified in
* <tt>hibernate.properties</tt> by default.
* <p/>
* NOTE : This will be replaced by use of {@link ServiceRegistryBuilder} and
* NOTE : This will be replaced by use of {@link org.hibernate.boot.registry.StandardServiceRegistryBuilder} and
* {@link org.hibernate.metamodel.MetadataSources} instead after the 4.0 release at which point this class will become
* deprecated and scheduled for removal in 5.0. See
* <a href="http://opensource.atlassian.com/projects/hibernate/browse/HHH-6183">HHH-6183</a>,
@ -1770,7 +1770,7 @@ public class Configuration implements Serializable {
public SessionFactory buildSessionFactory() throws HibernateException {
Environment.verifyProperties( properties );
ConfigurationHelper.resolvePlaceHolders( properties );
final ServiceRegistry serviceRegistry = new ServiceRegistryBuilder()
final ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
.applySettings( properties )
.buildServiceRegistry();
setSessionFactoryObserver(

2
hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
View File

@ -76,7 +76,7 @@ import org.hibernate.internal.util.config.ConfigurationHelper;
* </tr>
* <tr>
* <td><tt>hibernate.connection.provider_class</tt></td>
* <td>classname of <tt>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</tt>
* <td>classname of <tt>ConnectionProvider</tt>
* subclass (if not specified hueristics are used)</td>
* </tr>
* <tr><td><tt>hibernate.connection.username</tt></td><td>database username</td></tr>

2
hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
View File

@ -31,7 +31,7 @@ import org.hibernate.MultiTenancyStrategy;
import org.hibernate.cache.spi.QueryCacheFactory;
import org.hibernate.cache.spi.RegionFactory;
import org.hibernate.hql.spi.QueryTranslatorFactory;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.tuple.entity.EntityTuplizerFactory;
/**

8
hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
View File

@ -46,10 +46,10 @@ import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.tuple.entity.EntityTuplizerFactory;
/**

2
hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java
View File

@ -43,7 +43,7 @@ import org.hibernate.integrator.spi.Integrator;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.metamodel.source.MetadataImplementor;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
/**

2
hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java
View File

@ -39,7 +39,7 @@ import org.hibernate.context.spi.CurrentSessionContext;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
/**
* An implementation of {@link CurrentSessionContext} which scopes the notion

8
hibernate-core/src/main/java/org/hibernate/service/config/internal/ConfigurationServiceImpl.java → hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.config.internal;
package org.hibernate.engine.config.internal;
import java.util.Collections;
import java.util.Map;
@ -29,9 +29,9 @@ import java.util.Map;
import org.jboss.logging.Logger;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.classloading.spi.ClassLoadingException;
import org.hibernate.service.config.spi.ConfigurationService;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;

8
hibernate-core/src/main/java/org/hibernate/service/config/internal/ConfigurationServiceInitiator.java → hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceInitiator.java
View File

@ -21,18 +21,18 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.config.internal;
package org.hibernate.engine.config.internal;
import java.util.Map;
import org.hibernate.service.config.spi.ConfigurationService;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* @author Steve Ebersole
*/
public class ConfigurationServiceInitiator implements BasicServiceInitiator<ConfigurationService> {
public class ConfigurationServiceInitiator implements StandardServiceInitiator<ConfigurationService> {
public static final ConfigurationServiceInitiator INSTANCE = new ConfigurationServiceInitiator();
public ConfigurationService initiateService(Map configurationValues, ServiceRegistryImplementor registry) {

2
hibernate-core/src/main/java/org/hibernate/service/config/spi/ConfigurationService.java → hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.config.spi;
package org.hibernate.engine.config.spi;
import java.util.Map;

6
hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java
View File

@ -25,11 +25,11 @@ package org.hibernate.engine.jdbc.batch.internal;
import java.util.Map;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.batch.spi.BatchBuilder;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceRegistryImplementor;
@ -38,7 +38,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
*
* @author Steve Ebersole
*/
public class BatchBuilderInitiator implements BasicServiceInitiator<BatchBuilder> {
public class BatchBuilderInitiator implements StandardServiceInitiator<BatchBuilder> {
public static final BatchBuilderInitiator INSTANCE = new BatchBuilderInitiator();
public static final String BUILDER = "hibernate.jdbc.batch.builder";

10
hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/ConnectionProviderInitiator.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.connections.internal;
package org.hibernate.engine.jdbc.connections.internal;
import java.beans.BeanInfo;
import java.beans.PropertyDescriptor;
@ -36,13 +36,13 @@ import org.jboss.logging.Logger;
import org.hibernate.HibernateException;
import org.hibernate.MultiTenancyStrategy;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Environment;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.beans.BeanInfoHelper;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
@ -51,7 +51,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
* @author Gavin King
* @author Steve Ebersole
*/
public class ConnectionProviderInitiator implements BasicServiceInitiator<ConnectionProvider> {
public class ConnectionProviderInitiator implements StandardServiceInitiator<ConnectionProvider> {
public static final ConnectionProviderInitiator INSTANCE = new ConnectionProviderInitiator();
private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class,

8
hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DatasourceConnectionProviderImpl.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.connections.internal;
package org.hibernate.engine.jdbc.connections.internal;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Map;
@ -29,15 +29,15 @@ import javax.sql.DataSource;
import org.hibernate.HibernateException;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.UnknownUnwrapTypeException;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.jndi.spi.JndiService;
import org.hibernate.engine.jndi.spi.JndiService;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.InjectService;
import org.hibernate.service.spi.Stoppable;
/**
* A {@link ConnectionProvider} that manages connections from an underlying {@link DataSource}.
* A {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} that manages connections from an underlying {@link DataSource}.
* <p/>
* The {@link DataSource} to use may be specified by either:<ul>
* <li>injection via {@link #setDataSource}</li>

8
hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.connections.internal;
package org.hibernate.engine.jdbc.connections.internal;
import java.sql.Connection;
import java.sql.DriverManager;
@ -35,13 +35,13 @@ import org.jboss.logging.Logger;
import org.hibernate.HibernateException;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.UnknownUnwrapTypeException;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.classloading.spi.ClassLoadingException;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;

16
hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/MultiTenantConnectionProviderInitiator.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/MultiTenantConnectionProviderInitiator.java
View File

@ -21,26 +21,26 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.connections.internal;
package org.hibernate.engine.jdbc.connections.internal;
import java.util.Map;
import org.jboss.logging.Logger;
import org.hibernate.MultiTenancyStrategy;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.classloading.spi.ClassLoadingException;
import org.hibernate.service.jdbc.connections.spi.DataSourceBasedMultiTenantConnectionProviderImpl;
import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
import org.hibernate.engine.jdbc.connections.spi.DataSourceBasedMultiTenantConnectionProviderImpl;
import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* @author Steve Ebersole
*/
public class MultiTenantConnectionProviderInitiator implements BasicServiceInitiator<MultiTenantConnectionProvider> {
public class MultiTenantConnectionProviderInitiator implements StandardServiceInitiator<MultiTenantConnectionProvider> {
public static final MultiTenantConnectionProviderInitiator INSTANCE = new MultiTenantConnectionProviderInitiator();
private static final Logger log = Logger.getLogger( MultiTenantConnectionProviderInitiator.class );
@ -60,7 +60,7 @@ public class MultiTenantConnectionProviderInitiator implements BasicServiceIniti
final Object configValue = configurationValues.get( AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER );
if ( configValue == null ) {
// if they also specified the data source *name*, then lets assume they want
// org.hibernate.service.jdbc.connections.spi.DataSourceBasedMultiTenantConnectionProviderImpl
// DataSourceBasedMultiTenantConnectionProviderImpl
final Object dataSourceConfigValue = configurationValues.get( AvailableSettings.DATASOURCE );
if ( dataSourceConfigValue != null && String.class.isInstance( dataSourceConfigValue ) ) {
return new DataSourceBasedMultiTenantConnectionProviderImpl();

4
hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
View File

@ -21,12 +21,12 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.connections.internal;
package org.hibernate.engine.jdbc.connections.internal;
import java.sql.Connection;
import java.sql.SQLException;
import org.hibernate.service.UnknownUnwrapTypeException;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
/**
* An implementation of the {@link ConnectionProvider} interface that simply throws an exception when a connection

2
hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.connections.spi;
package org.hibernate.engine.jdbc.connections.spi;
import java.sql.Connection;
import java.sql.SQLException;

2
hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.connections.spi;
package org.hibernate.engine.jdbc.connections.spi;
import java.sql.Connection;
import java.sql.SQLException;

2
hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/ConnectionProvider.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.connections.spi;
package org.hibernate.engine.jdbc.connections.spi;
import java.sql.Connection;
import java.sql.SQLException;

6
hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.connections.spi;
package org.hibernate.engine.jdbc.connections.spi;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@ -30,8 +30,8 @@ import javax.sql.DataSource;
import org.hibernate.HibernateException;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.service.config.spi.ConfigurationService;
import org.hibernate.service.jndi.spi.JndiService;
import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.engine.jndi.spi.JndiService;
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.service.spi.Stoppable;

2
hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/MultiTenantConnectionProvider.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/MultiTenantConnectionProvider.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.connections.spi;
package org.hibernate.engine.jdbc.connections.spi;
import java.sql.Connection;
import java.sql.SQLException;

8
hibernate-core/src/main/java/org/hibernate/service/jdbc/cursor/internal/RefCursorSupportInitiator.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/RefCursorSupportInitiator.java
View File

@ -21,18 +21,18 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.cursor.internal;
package org.hibernate.engine.jdbc.cursor.internal;
import java.util.Map;
import org.hibernate.service.jdbc.cursor.spi.RefCursorSupport;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.engine.jdbc.cursor.spi.RefCursorSupport;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* @author Steve Ebersole
*/
public class RefCursorSupportInitiator implements BasicServiceInitiator<RefCursorSupport> {
public class RefCursorSupportInitiator implements StandardServiceInitiator<RefCursorSupport> {
public static final RefCursorSupportInitiator INSTANCE = new RefCursorSupportInitiator();
@Override

4
hibernate-core/src/main/java/org/hibernate/service/jdbc/cursor/internal/StandardRefCursorSupport.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.cursor.internal;
package org.hibernate.engine.jdbc.cursor.internal;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@ -35,7 +35,7 @@ import org.jboss.logging.Logger;
import org.hibernate.HibernateException;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.jdbc.cursor.spi.RefCursorSupport;
import org.hibernate.engine.jdbc.cursor.spi.RefCursorSupport;
import org.hibernate.service.spi.InjectService;
/**

2
hibernate-core/src/main/java/org/hibernate/service/jdbc/cursor/spi/RefCursorSupport.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.cursor.spi;
package org.hibernate.engine.jdbc.cursor.spi;
import java.sql.CallableStatement;
import java.sql.ResultSet;

4
hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/AbstractDialectResolver.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/AbstractDialectResolver.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.dialect.internal;
package org.hibernate.engine.jdbc.dialect.internal;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
@ -33,7 +33,7 @@ import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.resolver.BasicSQLExceptionConverter;
import org.hibernate.exception.JDBCConnectionException;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.service.jdbc.dialect.spi.DialectResolver;
import org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
/**
* A templated resolver impl which delegates to the {@link #resolveDialectInternal} method

2
hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/BasicDialectResolver.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/BasicDialectResolver.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.dialect.internal;
package org.hibernate.engine.jdbc.dialect.internal;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;

10
hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectFactoryImpl.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.dialect.internal;
package org.hibernate.engine.jdbc.dialect.internal;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@ -31,10 +31,10 @@ import java.util.Map;
import org.hibernate.HibernateException;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.Dialect;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.classloading.spi.ClassLoadingException;
import org.hibernate.service.jdbc.dialect.spi.DialectFactory;
import org.hibernate.service.jdbc.dialect.spi.DialectResolver;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
import org.hibernate.engine.jdbc.dialect.spi.DialectFactory;
import org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
import org.hibernate.service.spi.InjectService;
/**

8
hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectFactoryInitiator.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryInitiator.java
View File

@ -21,12 +21,12 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.dialect.internal;
package org.hibernate.engine.jdbc.dialect.internal;
import java.util.Map;
import org.hibernate.service.jdbc.dialect.spi.DialectFactory;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.engine.jdbc.dialect.spi.DialectFactory;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
@ -34,7 +34,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
*
* @author Steve Ebersole
*/
public class DialectFactoryInitiator implements BasicServiceInitiator<DialectFactory> {
public class DialectFactoryInitiator implements StandardServiceInitiator<DialectFactory> {
public static final DialectFactoryInitiator INSTANCE = new DialectFactoryInitiator();
@Override

10
hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectResolverInitiator.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverInitiator.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.dialect.internal;
package org.hibernate.engine.jdbc.dialect.internal;
import java.util.ArrayList;
import java.util.List;
@ -30,9 +30,9 @@ import java.util.Map;
import org.hibernate.HibernateException;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.jdbc.dialect.spi.DialectResolver;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceRegistryImplementor;
@ -41,7 +41,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
*
* @author Steve Ebersole
*/
public class DialectResolverInitiator implements BasicServiceInitiator<DialectResolver> {
public class DialectResolverInitiator implements StandardServiceInitiator<DialectResolver> {
public static final DialectResolverInitiator INSTANCE = new DialectResolverInitiator();
@Override

4
hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectResolverSet.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.dialect.internal;
package org.hibernate.engine.jdbc.dialect.internal;
import java.sql.DatabaseMetaData;
import java.util.ArrayList;
@ -33,7 +33,7 @@ import org.jboss.logging.Logger;
import org.hibernate.dialect.Dialect;
import org.hibernate.exception.JDBCConnectionException;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.service.jdbc.dialect.spi.DialectResolver;
import org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
/**
* A {@link DialectResolver} implementation which coordinates resolution by delegating to sub-resolvers.

2
hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.dialect.internal;
package org.hibernate.engine.jdbc.dialect.internal;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;

2
hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/spi/DialectFactory.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectFactory.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.dialect.spi;
package org.hibernate.engine.jdbc.dialect.spi;
import java.sql.Connection;
import java.util.Map;

2
hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/spi/DialectResolver.java → hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolver.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jdbc.dialect.spi;
package org.hibernate.engine.jdbc.dialect.spi;
import java.sql.DatabaseMetaData;

8
hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java
View File

@ -55,10 +55,10 @@ import org.hibernate.exception.spi.SQLExceptionConverter;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.service.jdbc.cursor.internal.StandardRefCursorSupport;
import org.hibernate.service.jdbc.dialect.spi.DialectFactory;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.engine.jdbc.cursor.internal.StandardRefCursorSupport;
import org.hibernate.engine.jdbc.dialect.spi.DialectFactory;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;

4
hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java
View File

@ -25,8 +25,8 @@ package org.hibernate.engine.jdbc.internal;
import java.util.Map;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
@ -36,7 +36,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
*
* @author Steve Ebersole
*/
public class JdbcServicesInitiator implements BasicServiceInitiator<JdbcServices> {
public class JdbcServicesInitiator implements StandardServiceInitiator<JdbcServices> {
public static final JdbcServicesInitiator INSTANCE = new JdbcServicesInitiator();
@Override

4
hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcConnectionAccess.java
View File

@ -56,8 +56,8 @@ public interface JdbcConnectionAccess extends Serializable {
* Does the underlying provider of connections support aggressive releasing of connections (and re-acquisition
* of those connections later, if need be) in JTA environments?
*
* @see org.hibernate.service.jdbc.connections.spi.ConnectionProvider#supportsAggressiveRelease()
* @see org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider#supportsAggressiveRelease()
* @see org.hibernate.engine.jdbc.connections.spi.ConnectionProvider#supportsAggressiveRelease()
* @see org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider#supportsAggressiveRelease()
*/
public boolean supportsAggressiveRelease();
}

2
hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java
View File

@ -29,7 +29,7 @@ import org.hibernate.dialect.Dialect;
import org.hibernate.engine.jdbc.LobCreationContext;
import org.hibernate.engine.jdbc.LobCreator;
import org.hibernate.service.Service;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
/**
* Contract for services around JDBC operations. These represent shared resources, aka not varied by session/use.

2
hibernate-core/src/main/java/org/hibernate/service/jndi/JndiException.java → hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiException.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jndi;
package org.hibernate.engine.jndi;
import org.hibernate.HibernateException;
/**

2
hibernate-core/src/main/java/org/hibernate/service/jndi/JndiNameException.java → hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiNameException.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jndi;
package org.hibernate.engine.jndi;
import org.hibernate.HibernateException;

8
hibernate-core/src/main/java/org/hibernate/service/jndi/internal/JndiServiceImpl.java → hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jndi.internal;
package org.hibernate.engine.jndi.internal;
import java.util.Hashtable;
import java.util.Map;
@ -38,9 +38,9 @@ import org.jboss.logging.Logger;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.jndi.JndiHelper;
import org.hibernate.service.jndi.JndiException;
import org.hibernate.service.jndi.JndiNameException;
import org.hibernate.service.jndi.spi.JndiService;
import org.hibernate.engine.jndi.JndiException;
import org.hibernate.engine.jndi.JndiNameException;
import org.hibernate.engine.jndi.spi.JndiService;
/**
* Standard implementation of JNDI services.

8
hibernate-core/src/main/java/org/hibernate/service/jndi/internal/JndiServiceInitiator.java → hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceInitiator.java
View File

@ -21,12 +21,12 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jndi.internal;
package org.hibernate.engine.jndi.internal;
import java.util.Map;
import org.hibernate.service.jndi.spi.JndiService;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.engine.jndi.spi.JndiService;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
@ -34,7 +34,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
*
* @author Steve Ebersole
*/
public class JndiServiceInitiator implements BasicServiceInitiator<JndiService> {
public class JndiServiceInitiator implements StandardServiceInitiator<JndiService> {
public static final JndiServiceInitiator INSTANCE = new JndiServiceInitiator();
@Override

2
hibernate-core/src/main/java/org/hibernate/service/jndi/spi/JndiService.java → hibernate-core/src/main/java/org/hibernate/engine/jndi/spi/JndiService.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jndi.spi;
package org.hibernate.engine.jndi.spi;
import javax.naming.event.NamespaceChangeListener;

2
hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
View File

@ -51,7 +51,7 @@ import org.hibernate.id.IdentifierGenerator;
import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.stat.spi.StatisticsImplementor;
import org.hibernate.type.Type;

2
hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
View File

@ -51,7 +51,7 @@ import org.hibernate.engine.transaction.synchronization.internal.Synchronization
import org.hibernate.engine.transaction.synchronization.spi.SynchronizationCallbackCoordinator;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.collections.CollectionHelper;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
/**
* Standard implementation of the Hibernate {@link TransactionCoordinator}

6
hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionFactoryInitiator.java
View File

@ -32,8 +32,8 @@ import org.hibernate.engine.transaction.internal.jdbc.JdbcTransactionFactory;
import org.hibernate.engine.transaction.spi.TransactionFactory;
import org.hibernate.engine.transaction.spi.TransactionImplementor;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.service.selector.spi.StrategySelector;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.boot.registry.selector.spi.StrategySelector;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
@ -42,7 +42,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor;
* @author Steve Ebersole
*/
public class TransactionFactoryInitiator<T extends TransactionImplementor>
implements BasicServiceInitiator<TransactionFactory> {
implements StandardServiceInitiator<TransactionFactory> {
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
CoreMessageLogger.class,

2
hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaTransactionFactory.java
View File

@ -30,7 +30,7 @@ import org.hibernate.ConnectionReleaseMode;
import org.hibernate.TransactionException;
import org.hibernate.engine.transaction.spi.TransactionCoordinator;
import org.hibernate.engine.transaction.spi.TransactionFactory;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
/**
* Factory for {@link JtaTransaction} instances.

6
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/AbstractJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.util.Map;
import javax.transaction.Synchronization;
@ -33,8 +33,8 @@ import javax.transaction.UserTransaction;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.jndi.spi.JndiService;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.engine.jndi.spi.JndiService;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;

6
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/BitronixJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java
View File

@ -21,14 +21,14 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.lang.reflect.Method;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.jta.platform.spi.JtaPlatformException;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException;
/**
* @author Steve Ebersole

2
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JBossAppServerJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java
View File

@ -21,12 +21,12 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.hibernate.service.jndi.JndiException;
import org.hibernate.engine.jndi.JndiException;
/**
* JtaPlatform definition for JBoss Application Server.

6
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JBossStandAloneJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java
View File

@ -21,13 +21,13 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.jta.platform.spi.JtaPlatformException;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException;
/**
* Return a standalone JTA transaction manager for JBoss Transactions

6
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JOTMJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java
View File

@ -21,14 +21,14 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.lang.reflect.Method;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.jta.platform.spi.JtaPlatformException;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException;
/**
* @author Steve Ebersole

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JOnASJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java
View File

@ -21,13 +21,13 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.lang.reflect.Method;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.hibernate.service.jta.platform.spi.JtaPlatformException;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException;
/**
* JTA platform implementation for JOnAS

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JRun4JtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java
View File

@ -21,13 +21,13 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
/**
* {@link org.hibernate.service.jta.platform.spi.JtaPlatform} implementation for JRun4 AS
* {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for JRun4 AS
*
* @author Joseph Bissen
* @author Steve Ebersole

16
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java
View File

@ -21,30 +21,30 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.util.Map;
import org.jboss.logging.Logger;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Environment;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.jndi.JndiHelper;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.config.spi.ConfigurationService;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.service.jta.platform.spi.JtaPlatformException;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.transaction.TransactionManagerLookup;
/**
* Standard initiator for the standard {@link org.hibernate.service.jta.platform.spi.JtaPlatform}
* Standard initiator for the standard {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform}
*
* @author Steve Ebersole
*/
public class JtaPlatformInitiator implements BasicServiceInitiator<JtaPlatform> {
public class JtaPlatformInitiator implements StandardServiceInitiator<JtaPlatform> {
public static final JtaPlatformInitiator INSTANCE = new JtaPlatformInitiator();
private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, JtaPlatformInitiator.class.getName());

2
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaSynchronizationStrategy.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.io.Serializable;
import javax.transaction.Synchronization;

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/NoJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.Status;
import javax.transaction.Synchronization;
@ -30,7 +30,7 @@ import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
/**
* The non-configured form of JTA platform. This is what is used if none was set up.

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/OC4JJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java
View File

@ -21,13 +21,13 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
/**
* {@link org.hibernate.service.jta.platform.spi.JtaPlatform} implementation for the OC4J (Oracle) AS.
* {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for the OC4J (Oracle) AS.
*
* @author Stijn Janssens
* @author Steve Ebersole

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/OrionJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java
View File

@ -21,13 +21,13 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
/**
* {@link org.hibernate.service.jta.platform.spi.JtaPlatform} implementation for Orion
* {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Orion
*
* @author Gavin King
* @author Steve Ebersole

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/ResinJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java
View File

@ -21,13 +21,13 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
/**
* {@link org.hibernate.service.jta.platform.spi.JtaPlatform} implementation for Resin
* {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Resin
*
* @author Aapo Laakkonen
* @author Steve Ebersole

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/SunOneJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java
View File

@ -21,13 +21,13 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
/**
* {@link org.hibernate.service.jta.platform.spi.JtaPlatform} implementation for Sun ONE Application Server 7 and above
* {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Sun ONE Application Server 7 and above
*
* @author Robert Davidson
* @author Sanjeev Krishnan

2
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/SynchronizationRegistryAccess.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.io.Serializable;
import javax.transaction.TransactionSynchronizationRegistry;

2
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.Synchronization;
import javax.transaction.TransactionSynchronizationRegistry;

2
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/TransactionManagerAccess.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.io.Serializable;
import javax.transaction.TransactionManager;

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java
View File

@ -21,12 +21,12 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.Synchronization;
import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
import org.hibernate.service.jta.platform.spi.JtaPlatformException;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException;
/**
* Implementation of the {@link JtaSynchronizationStrategy} contract based on using a

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/TransactionManagerLookupBridge.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerLookupBridge.java
View File

@ -21,14 +21,14 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.util.Properties;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.hibernate.service.jndi.spi.JndiService;
import org.hibernate.engine.jndi.spi.JndiService;
import org.hibernate.transaction.TransactionManagerLookup;
/**

2
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/WebSphereExtendedJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/WebSphereJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import java.lang.reflect.Method;
import javax.transaction.TransactionManager;
@ -30,7 +30,7 @@ import javax.transaction.UserTransaction;
import org.jboss.logging.Logger;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.service.jta.platform.spi.JtaPlatformException;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException;
/**
* JTA platform implementation for WebSphere (versions 4, 5.0 and 5.1)

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/WeblogicJtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java
View File

@ -21,13 +21,13 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.internal;
package org.hibernate.engine.transaction.jta.platform.internal;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
/**
* {@link org.hibernate.service.jta.platform.spi.JtaPlatform} implementation for Weblogic
* {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Weblogic
*
* @author Gavin King
* @author Steve Ebersole

2
hibernate-core/src/main/java/org/hibernate/service/jta/platform/spi/JtaPlatform.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.spi;
package org.hibernate.engine.transaction.jta.platform.spi;
import javax.transaction.Synchronization;
import javax.transaction.SystemException;

2
hibernate-core/src/main/java/org/hibernate/service/jta/platform/spi/JtaPlatformException.java → hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformException.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.service.jta.platform.spi;
package org.hibernate.engine.transaction.jta.platform.spi;
import org.hibernate.HibernateException;

4
hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/AbstractTransactionImpl.java
View File

@ -31,7 +31,7 @@ import org.jboss.logging.Logger;
import org.hibernate.HibernateException;
import org.hibernate.TransactionException;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
/**
* Abstract support for creating {@link TransactionImplementor transaction} implementations
@ -98,7 +98,7 @@ public abstract class AbstractTransactionImpl implements TransactionImplementor
/**
* Provide subclasses with convenient access to the configured {@link JtaPlatform}
*
* @return The {@link org.hibernate.service.jta.platform.spi.JtaPlatform}
* @return The {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform}
*/
protected JtaPlatform jtaPlatform() {
return transactionCoordinator().getTransactionContext().getTransactionEnvironment().getJtaPlatform();

2
hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionEnvironment.java
View File

@ -25,7 +25,7 @@ package org.hibernate.engine.transaction.spi;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.stat.spi.StatisticsImplementor;
/**

4
hibernate-core/src/main/java/org/hibernate/id/factory/internal/MutableIdentifierGeneratorFactoryInitiator.java
View File

@ -2,14 +2,14 @@ package org.hibernate.id.factory.internal;
import java.util.Map;
import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory;
import org.hibernate.service.spi.BasicServiceInitiator;
import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* @author Emmanuel Bernard <emmanuel@hibernate.org>
*/
public class MutableIdentifierGeneratorFactoryInitiator implements BasicServiceInitiator<MutableIdentifierGeneratorFactory> {
public class MutableIdentifierGeneratorFactoryInitiator implements StandardServiceInitiator<MutableIdentifierGeneratorFactory> {
public static final MutableIdentifierGeneratorFactoryInitiator INSTANCE = new MutableIdentifierGeneratorFactoryInitiator();
@Override

2
hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java
View File

@ -30,7 +30,7 @@ import org.jboss.logging.Logger;
import org.hibernate.cfg.beanvalidation.BeanValidationIntegrator;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.integrator.spi.IntegratorService;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
/**
* @author Steve Ebersole

4
hibernate-core/src/main/java/org/hibernate/integrator/spi/ServiceContributingIntegrator.java
View File

@ -23,7 +23,7 @@
*/
package org.hibernate.integrator.spi;
import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
/**
* Additional, optional contract for Integrators that wish to contribute {@link org.hibernate.service.Service services}
@ -38,5 +38,5 @@ public interface ServiceContributingIntegrator extends Integrator {
*
* @param serviceRegistryBuilder The build to prepare.
*/
public void prepareServices(ServiceRegistryBuilder serviceRegistryBuilder);
public void prepareServices(StandardServiceRegistryBuilder serviceRegistryBuilder);
}

4
hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
View File

@ -55,8 +55,8 @@ import org.hibernate.engine.transaction.spi.TransactionEnvironment;
import org.hibernate.jdbc.WorkExecutor;
import org.hibernate.jdbc.WorkExecutorVisitable;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
import org.hibernate.type.Type;
/**

Some files were not shown because too many files have changed in this diff Show More