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

HHH-5903 - Rename ServicesRegistry to ServiceRegistry

This commit is contained in:
Steve Ebersole 2011-02-08 11:27:27 -06:00
parent 2f8655e661
commit 011d7e1114
27 changed files with 59 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,8 +152,7 @@ import org.hibernate.mapping.TypeDef;
import org.hibernate.mapping.UniqueKey;
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.secure.JACCConfiguration;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.ServiceRegistry;
import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.hibernate.tool.hbm2ddl.IndexMetadata;
import org.hibernate.tool.hbm2ddl.TableMetadata;
@ -1823,7 +1822,7 @@ public class Configuration implements Serializable {
*
* @throws HibernateException usually indicates an invalid configuration or invalid mapping information
*/
public SessionFactory buildSessionFactory(ServicesRegistry serviceRegistry) throws HibernateException {
public SessionFactory buildSessionFactory(ServiceRegistry serviceRegistry) throws HibernateException {
log.debug( "Preparing to build session factory with filters : " + filterDefinitions );
secondPassCompile();

6
hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java
View File

@ -29,7 +29,7 @@ import java.util.Map;
import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
import org.hibernate.service.classloading.internal.ClassLoaderServiceInitiator;
import org.hibernate.service.internal.ServicesRegistryImpl;
import org.hibernate.service.internal.ServiceRegistryImpl;
import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator;
import org.hibernate.service.jdbc.dialect.internal.DialectFactoryInitiator;
import org.hibernate.service.jdbc.dialect.internal.DialectResolverInitiator;
@ -60,8 +60,8 @@ public class ServicesRegistryBootstrap {
//serviceInitiators.add( TransactionFactoryInitiator.INSTANCE );
}
public ServicesRegistryImpl initiateServicesRegistry(Map configurationValues) {
final ServicesRegistryImpl servicesRegistry = new ServicesRegistryImpl( serviceInitiators );
public ServiceRegistryImpl initiateServicesRegistry(Map configurationValues) {
final ServiceRegistryImpl servicesRegistry = new ServiceRegistryImpl( serviceInitiators );
servicesRegistry.initialize( configurationValues );
return servicesRegistry;
}

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

@ -26,8 +26,8 @@ package org.hibernate.engine.jdbc.internal;
import java.util.Map;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServiceRegistry;
/**
* Standard initiator for the standard {@link JdbcServices} service
@ -47,7 +47,7 @@ public class JdbcServicesInitiator implements ServiceInitiator<JdbcServices> {
/**
* {@inheritDoc}
*/
public JdbcServices initiateService(Map configValues, ServicesRegistry registry) {
public JdbcServices initiateService(Map configValues, ServiceRegistry registry) {
return new JdbcServicesImpl();
}
}

6
hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java
View File

@ -113,7 +113,7 @@ import org.hibernate.persister.entity.Loadable;
import org.hibernate.persister.entity.Queryable;
import org.hibernate.pretty.MessageHelper;
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceRegistry;
import org.hibernate.stat.ConcurrentStatisticsImpl;
import org.hibernate.stat.Statistics;
import org.hibernate.stat.StatisticsImplementor;
@ -174,7 +174,7 @@ public final class SessionFactoryImpl implements SessionFactory, SessionFactoryI
private final transient Map fetchProfiles;
private final transient Map imports;
private final transient Interceptor interceptor;
private final transient ServicesRegistry serviceRegistry;
private final transient ServiceRegistry serviceRegistry;
private final transient Settings settings;
private final transient Properties properties;
private transient SchemaExport schemaExport;
@ -199,7 +199,7 @@ public final class SessionFactoryImpl implements SessionFactory, SessionFactoryI
public SessionFactoryImpl(
Configuration cfg,
Mapping mapping,
ServicesRegistry serviceRegistry,
ServiceRegistry serviceRegistry,
Settings settings,
EventListeners listeners,
SessionFactoryObserver observer) throws HibernateException {

1
hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java
View File

@ -13,7 +13,6 @@ import org.hibernate.HibernateException;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Environment;
import org.hibernate.cfg.internal.ServicesRegistryBootstrap;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.internal.util.jndi.JndiHelper;
import org.hibernate.util.ExternalSessionFactoryConfig;

4
hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceInitiator.java
View File

@ -27,7 +27,7 @@ import java.util.Map;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceRegistry;
/**
@ -44,7 +44,7 @@ public class ClassLoaderServiceInitiator implements ServiceInitiator<ClassLoader
}
@Override
public ClassLoaderService initiateService(Map configurationValues, ServicesRegistry registry) {
public ClassLoaderService initiateService(Map configurationValues, ServiceRegistry registry) {
return new ClassLoaderServiceImpl( configurationValues );
}
}

8
hibernate-core/src/main/java/org/hibernate/service/internal/ServicesRegistryImpl.java → hibernate-core/src/main/java/org/hibernate/service/internal/ServiceRegistryImpl.java
View File

@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.spi.Service;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceRegistry;
import org.hibernate.service.spi.Stoppable;
import org.hibernate.service.spi.UnknownServiceException;
@ -45,8 +45,8 @@ import org.hibernate.service.spi.UnknownServiceException;
*
* @author Steve Ebersole
*/
public class ServicesRegistryImpl implements ServicesRegistry {
private static final Logger log = LoggerFactory.getLogger( ServicesRegistryImpl.class );
public class ServiceRegistryImpl implements ServiceRegistry {
private static final Logger log = LoggerFactory.getLogger( ServiceRegistryImpl.class );
private final List<ServiceInitiator> serviceInitiators;
private ServicesInitializer initializer;
@ -56,7 +56,7 @@ public class ServicesRegistryImpl implements ServicesRegistry {
// iterate it in reverse order which is only available through ListIterator
private List<Service> serviceList = new ArrayList<Service>();
public ServicesRegistryImpl(List<ServiceInitiator> serviceInitiators) {
public ServiceRegistryImpl(List<ServiceInitiator> serviceInitiators) {
this.serviceInitiators = Collections.unmodifiableList( serviceInitiators );
}

10
hibernate-core/src/main/java/org/hibernate/service/internal/ServicesInitializer.java
View File

@ -38,7 +38,7 @@ import org.hibernate.service.spi.Manageable;
import org.hibernate.service.spi.Service;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServicesRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.Startable;
import org.hibernate.service.spi.UnknownServiceException;
@ -50,12 +50,12 @@ import org.hibernate.service.spi.UnknownServiceException;
public class ServicesInitializer {
private static final Logger log = LoggerFactory.getLogger( ServicesInitializer.class );
private final ServicesRegistryImpl servicesRegistry;
private final ServiceRegistryImpl servicesRegistry;
private final Map<Class,ServiceInitiator> serviceInitiatorMap;
private final Map configurationValues;
public ServicesInitializer(
ServicesRegistryImpl servicesRegistry,
ServiceRegistryImpl servicesRegistry,
List<ServiceInitiator> serviceInitiators,
Map configurationValues) {
this.servicesRegistry = servicesRegistry;
@ -131,8 +131,8 @@ public class ServicesInitializer {
( (Configurable) service ).configure( configurationValues );
}
if ( ServicesRegistryAwareService.class.isInstance( service ) ) {
( (ServicesRegistryAwareService) service ).injectServices( servicesRegistry );
if ( ServiceRegistryAwareService.class.isInstance( service ) ) {
( (ServiceRegistryAwareService) service ).injectServices( servicesRegistry );
}
}

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

@ -40,8 +40,8 @@ import org.hibernate.cfg.Environment;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.internal.util.beans.BeanInfoHelper;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServiceRegistry;
/**
* Instantiates and configures an appropriate {@link ConnectionProvider}.
@ -103,7 +103,7 @@ public class ConnectionProviderInitiator implements ServiceInitiator<ConnectionP
/**
* {@inheritDoc}
*/
public ConnectionProvider initiateService(Map configurationValues, ServicesRegistry registry) {
public ConnectionProvider initiateService(Map configurationValues, ServiceRegistry registry) {
final ClassLoaderService classLoaderService = registry.getService( ClassLoaderService.class );
ConnectionProvider connectionProvider = null;

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

@ -26,8 +26,8 @@ package org.hibernate.service.jdbc.dialect.internal;
import java.util.Map;
import org.hibernate.service.jdbc.dialect.spi.DialectFactory;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServiceRegistry;
/**
* Standard initiator for the standard {@link DialectFactory} service
@ -47,7 +47,7 @@ public class DialectFactoryInitiator implements ServiceInitiator<DialectFactory>
/**
* {@inheritDoc}
*/
public DialectFactory initiateService(Map configVales, ServicesRegistry registry) {
public DialectFactory initiateService(Map configVales, ServiceRegistry registry) {
return new DialectFactoryImpl();
}
}

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

@ -26,8 +26,8 @@ package org.hibernate.service.jdbc.dialect.internal;
import java.util.Map;
import org.hibernate.service.jdbc.dialect.spi.DialectResolver;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServiceRegistry;
/**
* Standard initiator for the standard {@link DialectResolver} service
@ -47,7 +47,7 @@ public class DialectResolverInitiator implements ServiceInitiator<DialectResolve
/**
* {@inheritDoc}
*/
public DialectResolver initiateService(Map configVales, ServicesRegistry registry) {
public DialectResolver initiateService(Map configVales, ServiceRegistry registry) {
return new StandardDialectResolver();
}
}

4
hibernate-core/src/main/java/org/hibernate/service/jmx/internal/JmxServiceInitiator.java
View File

@ -27,8 +27,8 @@ import java.util.Map;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.jmx.spi.JmxService;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServiceRegistry;
/**
* Standard initiator for the standard {@link JmxService} service
@ -45,7 +45,7 @@ public class JmxServiceInitiator implements ServiceInitiator<JmxService> {
}
@Override
public JmxService initiateService(Map configValues, ServicesRegistry registry) {
public JmxService initiateService(Map configValues, ServiceRegistry registry) {
return ConfigurationHelper.getBoolean( JMX_ENABLED, configValues, false )
? new JmxServiceImpl( configValues )
: DisabledJmxServiceImpl.INSTANCE;

4
hibernate-core/src/main/java/org/hibernate/service/jndi/internal/JndiServiceInitiator.java
View File

@ -27,7 +27,7 @@ import java.util.Map;
import org.hibernate.service.jndi.spi.JndiService;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceRegistry;
/**
* Standard initiator for the standard {@link JndiService} service
@ -43,7 +43,7 @@ public class JndiServiceInitiator implements ServiceInitiator<JndiService> {
}
@Override
public JndiService initiateService(Map configurationValues, ServicesRegistry registry) {
public JndiService initiateService(Map configurationValues, ServiceRegistry registry) {
return new JndiServiceImpl( configurationValues );
}
}

4
hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java
View File

@ -28,8 +28,8 @@ import java.util.Map;
import org.hibernate.HibernateException;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.jta.platform.spi.JtaPlatform;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.service.spi.ServiceRegistry;
/**
* Standard initiator for the standard {@link org.hibernate.service.jta.platform.spi.JtaPlatform}
@ -51,7 +51,7 @@ public class JtaPlatformInitiator implements ServiceInitiator<JtaPlatform> {
/**
* {@inheritDoc}
*/
public JtaPlatform initiateService(Map configVales, ServicesRegistry registry) {
public JtaPlatform initiateService(Map configVales, ServiceRegistry registry) {
final Object platform = configVales.get( JTA_PLATFORM );
if ( JtaPlatform.class.isInstance( platform ) ) {
return (JtaPlatform) platform;

2
hibernate-core/src/main/java/org/hibernate/service/spi/ServiceInitiator.java
View File

@ -46,5 +46,5 @@ public interface ServiceInitiator<T extends Service> {
*
* @return The initiated service.
*/
public T initiateService(Map configurationValues, ServicesRegistry registry);
public T initiateService(Map configurationValues, ServiceRegistry registry);
}

2
hibernate-core/src/main/java/org/hibernate/service/spi/ServicesRegistry.java → hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistry.java
View File

@ -28,7 +28,7 @@ package org.hibernate.service.spi;
*
* @author Steve Ebersole
*/
public interface ServicesRegistry {
public interface ServiceRegistry {
/**
* Retrieve a service by role.
*

10
hibernate-core/src/main/java/org/hibernate/service/spi/ServicesRegistryAwareService.java → hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryAwareService.java
View File

@ -24,15 +24,15 @@
package org.hibernate.service.spi;
/**
* Allows services to be injected with the {@link ServicesRegistry} during configuration phase.
* Allows services to be injected with the {@link ServiceRegistry} during configuration phase.
*
* @author Steve Ebersole
*/
public interface ServicesRegistryAwareService {
public interface ServiceRegistryAwareService {
/**
* Callback to inject the regsitry.
* Callback to inject the registry.
*
* @param servicesRegistry The registry
* @param serviceRegistry The registry
*/
public void injectServices(ServicesRegistry servicesRegistry);
public void injectServices(ServiceRegistry serviceRegistry);
}

9
hibernate-core/src/test/java/org/hibernate/test/cfg/internal/ServiceBootstrappingTest.java
View File

@ -27,9 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.hibernate.service.internal.ServiceRegistryImpl;
import org.hibernate.testing.junit.UnitTestCase;
import org.hibernate.cfg.Environment;
@ -41,7 +39,6 @@ import org.hibernate.service.jdbc.dialect.internal.DialectFactoryInitiator;
import org.hibernate.service.jdbc.dialect.internal.DialectResolverInitiator;
import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.internal.ServicesRegistryImpl;
import org.hibernate.service.spi.ServiceInitiator;
import org.hibernate.test.common.ConnectionProviderBuilder;
@ -51,7 +48,7 @@ import org.hibernate.test.common.ConnectionProviderBuilder;
* @author Steve Ebersole
*/
public class ServiceBootstrappingTest extends UnitTestCase {
private ServicesRegistryImpl servicesRegistry;
private ServiceRegistryImpl servicesRegistry;
public ServiceBootstrappingTest(String string) {
super( string );
@ -65,7 +62,7 @@ public class ServiceBootstrappingTest extends UnitTestCase {
serviceInitiators.add( DialectFactoryInitiator.INSTANCE );
serviceInitiators.add( JdbcServicesInitiator.INSTANCE );
servicesRegistry = new ServicesRegistryImpl( serviceInitiators );
servicesRegistry = new ServiceRegistryImpl( serviceInitiators );
}
protected void tearDown() {

4
hibernate-core/src/test/java/org/hibernate/test/cfg/internal/TestServicesRegistryBootstrapping.java
View File

@ -25,7 +25,7 @@ package org.hibernate.test.cfg.internal;
import org.hibernate.cfg.internal.ServicesRegistryBootstrap;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.internal.ServicesRegistryImpl;
import org.hibernate.service.internal.ServiceRegistryImpl;
import org.hibernate.test.common.ConnectionProviderBuilder;
import org.hibernate.testing.junit.UnitTestCase;
@ -41,7 +41,7 @@ public class TestServicesRegistryBootstrapping extends UnitTestCase {
}
public void testBasicBootstrapping() {
ServicesRegistryImpl servicesRegistry = new ServicesRegistryBootstrap().initiateServicesRegistry(
ServiceRegistryImpl servicesRegistry = new ServicesRegistryBootstrap().initiateServicesRegistry(
ConnectionProviderBuilder.getConnectionProviderProperties()
);

10
hibernate-core/src/test/java/org/hibernate/test/common/ServiceRegistryHolder.java
View File

@ -23,7 +23,6 @@
*/
package org.hibernate.test.common;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@ -33,15 +32,14 @@ import org.hibernate.engine.jdbc.internal.JdbcServicesImpl;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.classloading.spi.ClassLoaderService;
import org.hibernate.service.internal.ServicesRegistryImpl;
import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.internal.ServiceRegistryImpl;
import org.hibernate.service.spi.ServiceRegistry;
/**
* @author Gail Badner
*/
public class ServiceRegistryHolder {
private final ServicesRegistryImpl serviceRegistry;
private final ServiceRegistryImpl serviceRegistry;
private final Properties properties;
public ServiceRegistryHolder(Map props) {
@ -57,7 +55,7 @@ public class ServiceRegistryHolder {
return properties;
}
public ServicesRegistry getServiceRegistry() {
public ServiceRegistry getServiceRegistry() {
return serviceRegistry;
}

4
hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java
View File

@ -38,7 +38,7 @@ import junit.framework.TestSuite;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceRegistry;
import org.hibernate.test.common.ServiceRegistryHolder;
/**
@ -96,7 +96,7 @@ public abstract class UnitTestCase extends junit.framework.TestCase {
}
}
protected ServicesRegistry getServiceRegistry() {
protected ServiceRegistry getServiceRegistry() {
if ( serviceRegistryHolder == null ) {
serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() );
}

4
hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java
View File

@ -40,7 +40,7 @@ import org.hibernate.mapping.Property;
import org.hibernate.mapping.SimpleValue;
import org.hibernate.mapping.Collection;
import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceRegistry;
import org.hibernate.test.common.ServiceRegistryHolder;
/**
@ -80,7 +80,7 @@ public class ExecutionEnvironment {
return configuration;
}
public ServicesRegistry getServiceRegistry() {
public ServiceRegistry getServiceRegistry() {
return serviceRegistryHolder.getServiceRegistry();
}

4
hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java
View File

@ -42,7 +42,7 @@ import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.jdbc.Work;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceRegistry;
import org.hibernate.test.common.ServiceRegistryHolder;
import org.hibernate.testing.junit.DialectChecks;
import org.hibernate.testing.junit.FailureExpected;
@ -152,7 +152,7 @@ public abstract class HibernateTestCase extends TestCase {
handleUnclosedResources();
}
protected ServicesRegistry getServiceRegistry() {
protected ServiceRegistry getServiceRegistry() {
if ( serviceRegistryHolder == null ) {
serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() );
}

6
hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
View File

@ -73,7 +73,6 @@ import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.cfg.NamingStrategy;
import org.hibernate.cfg.Settings;
import org.hibernate.cfg.annotations.reflection.XMLContext;
import org.hibernate.ejb.connection.InjectedDataSourceConnectionProvider;
import org.hibernate.ejb.instrument.InterceptFieldClassFileTransformer;
@ -94,8 +93,7 @@ import org.hibernate.mapping.PersistentClass;
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.secure.JACCConfiguration;
import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.spi.ServiceRegistry;
import org.hibernate.transaction.JDBCTransactionFactory;
import org.hibernate.util.CollectionHelper;
import org.hibernate.util.ReflectHelper;
@ -1505,7 +1503,7 @@ public class Ejb3Configuration implements Serializable, Referenceable {
return cfg.getEventListeners();
}
SessionFactory buildSessionFactory(ServicesRegistry serviceRegistry) throws HibernateException {
SessionFactory buildSessionFactory(ServiceRegistry serviceRegistry) throws HibernateException {
return cfg.buildSessionFactory( serviceRegistry );
}

7
hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java
View File

@ -25,7 +25,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.Iterator;
import java.io.Serializable;
import javax.persistence.EntityManager;
@ -39,7 +38,6 @@ import javax.persistence.spi.LoadState;
import org.hibernate.SessionFactory;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
import org.hibernate.EntityMode;
import org.hibernate.cfg.internal.ServicesRegistryBootstrap;
import org.hibernate.metadata.ClassMetadata;
@ -49,8 +47,7 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.ejb.criteria.CriteriaBuilderImpl;
import org.hibernate.ejb.metamodel.MetamodelImpl;
import org.hibernate.ejb.util.PersistenceUtilHelper;
import org.hibernate.service.internal.ServicesRegistryImpl;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.service.internal.ServiceRegistryImpl;
/**
* Actual Hiberate implementation of {@link javax.persistence.EntityManagerFactory}.
@ -60,7 +57,7 @@ import org.hibernate.service.spi.ServicesRegistry;
* @author Steve Ebersole
*/
public class EntityManagerFactoryImpl implements HibernateEntityManagerFactory {
private final transient ServicesRegistryImpl serviceRegistry;
private final transient ServiceRegistryImpl serviceRegistry;
private final SessionFactory sessionFactory;
private final PersistenceUnitTransactionType transactionType;
private final boolean discardOnClose;

4
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java vendored
View File

@ -27,10 +27,6 @@ import java.util.Set;
import org.hibernate.cache.RegionFactory;
import org.hibernate.cache.infinispan.util.CacheHelper;
import org.hibernate.cfg.Environment;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.ServicesRegistry;
import org.hibernate.testing.junit.UnitTestCase;
import org.hibernate.test.cache.infinispan.util.CacheTestSupport;
import org.infinispan.Cache;

2
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java vendored
View File

@ -37,8 +37,6 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.cfg.Settings;
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.ServicesRegistry;
/**
* Utilities for cache testing.