HHH-7556 - Clean up packages

hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java

@@ -36,7 +36,7 @@ import org.hibernate.integrator.spi.ServiceContributingIntegrator;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl;
 import org.hibernate.jaxb.spi.cfg.JaxbHibernateConfiguration;
-import org.hibernate.service.ConfigLoader;
+import org.hibernate.boot.registry.internal.ConfigLoader;
 import org.hibernate.service.Service;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.service.StandardServiceInitiators;

hibernate-core/src/main/java/org/hibernate/boot/registry/internal/ConfigLoader.java

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

hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java

@@ -25,18 +25,15 @@ package org.hibernate.cache.internal;
 
 import org.jboss.logging.Logger;
 
-import org.hibernate.boot.registry.StandardServiceInitiator;
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.cache.spi.RegionFactory;
-import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.metamodel.spi.MetadataImplementor;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
-import org.hibernate.service.spi.ServiceException;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.service.spi.SessionFactoryServiceInitiator;
 

hibernate-core/src/main/java/org/hibernate/cache/internal/StandardQueryCache.java

@@ -44,7 +44,7 @@ import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.type.Type;
 import org.hibernate.type.TypeHelper;
 

hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractRegionFactory.java

@@ -33,7 +33,7 @@ import org.hibernate.cfg.Settings;
 import org.hibernate.cfg.SettingsFactory;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.service.spi.ServiceRegistryAwareService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 

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

@@ -617,8 +617,8 @@ public interface AvailableSettings {
 	public static final String JPA_METAMODEL_POPULATION = "hibernate.ejb.metamodel.population";
 
 	/**
-	 * Used to specify the {@link org.hibernate.service.schema.spi.SchemaManagementTool} to use for performing
+	 * Used to specify the {@link org.hibernate.tool.schema.spi.SchemaManagementTool} to use for performing
-	 * schema management.  The default is to use {@link org.hibernate.service.schema.internal.HibernateSchemaManagementTool}
+	 * schema management.  The default is to use {@link org.hibernate.tool.schema.internal.HibernateSchemaManagementTool}
 	 *
 	 * @since 5.0
 	 */

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

@@ -49,7 +49,7 @@ 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.service.jdbc.env.spi.ExtractedDatabaseMetaData;
+import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData;
 import org.hibernate.tuple.entity.EntityTuplizerFactory;
 
 /**

hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java

@@ -83,13 +83,13 @@ import org.hibernate.metamodel.spi.relational.Sequence;
 import org.hibernate.metamodel.spi.relational.Table;
 import org.hibernate.metamodel.spi.relational.UniqueKey;
 import org.hibernate.persister.entity.Lockable;
-import org.hibernate.service.schema.internal.StandardAuxiliaryDatabaseObjectExporter;
+import org.hibernate.tool.schema.internal.StandardAuxiliaryDatabaseObjectExporter;
-import org.hibernate.service.schema.internal.StandardForeignKeyExporter;
+import org.hibernate.tool.schema.internal.StandardForeignKeyExporter;
-import org.hibernate.service.schema.internal.StandardIndexExporter;
+import org.hibernate.tool.schema.internal.StandardIndexExporter;
-import org.hibernate.service.schema.internal.StandardSequenceExporter;
+import org.hibernate.tool.schema.internal.StandardSequenceExporter;
-import org.hibernate.service.schema.internal.StandardTableExporter;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
-import org.hibernate.service.schema.internal.StandardUniqueKeyExporter;
+import org.hibernate.tool.schema.internal.StandardUniqueKeyExporter;
-import org.hibernate.service.schema.spi.Exporter;
+import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.sql.ANSICaseFragment;
 import org.hibernate.sql.ANSIJoinFragment;
 import org.hibernate.sql.CaseFragment;

hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java

@@ -26,25 +26,13 @@ package org.hibernate.engine.config.internal;
 import java.util.Collections;
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
-import org.hibernate.internal.CoreMessageLogger;
-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;
 
 /**
  * @author Steve Ebersole
  */
-public class ConfigurationServiceImpl implements ConfigurationService, ServiceRegistryAwareService {
+public class ConfigurationServiceImpl implements ConfigurationService {
-	private static final CoreMessageLogger LOG = Logger.getMessageLogger(
-			CoreMessageLogger.class,
-			ConfigurationServiceImpl.class.getName()
-	);
 	private final Map settings;
-	private ServiceRegistryImplementor serviceRegistry;
 
 	@SuppressWarnings( "unchecked" )
 	public ConfigurationServiceImpl(Map settings) {
@@ -57,8 +45,9 @@ public class ConfigurationServiceImpl implements ConfigurationService, ServiceRe
 	}
 
 	@Override
-	public void injectServices(ServiceRegistryImplementor serviceRegistry) {
+	@SuppressWarnings("unchecked")
-		this.serviceRegistry = serviceRegistry;
+	public <T> T getSetting(String name) {
+		return (T) getSettings().get( name );
 	}
 
 	@Override
@@ -66,6 +55,11 @@ public class ConfigurationServiceImpl implements ConfigurationService, ServiceRe
 		return getSetting( name, converter, null );
 	}
 
+	@Override
+	public <T> T getSetting(String name, Class<T> expectedType) {
+		return getSetting( name, expectedType, null );
+	}
+
 	@Override
 	public <T> T getSetting(String name, Converter<T> converter, T defaultValue) {
 		final Object value = settings.get( name );
@@ -75,44 +69,13 @@ public class ConfigurationServiceImpl implements ConfigurationService, ServiceRe
 
 		return converter.convert( value );
 	}
+
 	@Override
+	@SuppressWarnings("unchecked")
 	public <T> T getSetting(String name, Class<T> expected, T defaultValue) {
 		Object value = settings.get( name );
-		T target = cast( expected, value );
+		return value == null
-		return target !=null ? target : defaultValue;
+				? defaultValue
+				: (T) value;
 	}
-	@Override
-	public <T> T cast(Class<T> expected, Object candidate){
-		if(candidate == null) return null;
-		if ( expected.isInstance( candidate ) ) {
-			return (T) candidate;
-		}
-		Class<T> target;
-		if ( Class.class.isInstance( candidate ) ) {
-			target = Class.class.cast( candidate );
-		}
-		else {
-			try {
-				target = serviceRegistry.getService( ClassLoaderService.class ).classForName( candidate.toString() );
-			}
-			catch ( ClassLoadingException e ) {
-				LOG.debugf( "Unable to locate %s implementation class %s", expected.getName(), candidate.toString() );
-				target = null;
-			}
-		}
-		if ( target != null ) {
-			try {
-				return target.newInstance();
-			}
-			catch ( Exception e ) {
-				LOG.debugf(
-						"Unable to instantiate %s class %s", expected.getName(),
-						target.getName()
-				);
-			}
-		}
-		return null;
-	}
-
-
 }

hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java

@@ -35,18 +35,12 @@ import org.hibernate.service.Service;
 public interface ConfigurationService extends Service {
 	public Map getSettings();
 
+	public <T> T getSetting(String name);
 	public <T> T getSetting(String name, Converter<T> converter);
+	public <T> T getSetting(String name, Class<T> expectedType);
 	public <T> T getSetting(String name, Converter<T> converter, T defaultValue);
 	public <T> T getSetting(String name, Class<T> expected, T defaultValue);
 
-	/**
-	 * Cast <tt>candidate</tt> to the instance of <tt>expected</tt> type.
-	 *
-	 * @param expected The type of instance expected to return.
-	 * @param candidate The candidate object to be casted.
-	 * @return The instance of expected type or null if this cast fail.
-	 */
-	public <T> T cast(Class<T> expected, Object candidate);
 	public static interface Converter<T> {
 		public T convert(Object value);
 	}

hibernate-core/src/main/java/org/hibernate/engine/config/spi/StandardConverters.java

@@ -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 static org.hibernate.engine.config.spi.ConfigurationService.Converter;

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

@@ -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 org.hibernate.HibernateException;
 

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

@@ -28,7 +28,6 @@ import java.sql.SQLException;
 
 import org.hibernate.service.UnknownUnwrapTypeException;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.service.jdbc.connections.internal.UserSuppliedConnectionException;
 
 /**
  * An implementation of the {@link ConnectionProvider} interface that simply throws an exception when a connection

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java

@@ -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.io.Serializable;
 import java.sql.Connection;

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java

@@ -21,11 +21,11 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.env.internal;
+package org.hibernate.engine.jdbc.env.internal;
 
-import org.hibernate.service.jdbc.env.spi.ExtractedDatabaseMetaData;
+import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.jdbc.env.spi.SQLStateType;
+import org.hibernate.engine.jdbc.env.spi.SQLStateType;
 
 /**
  * Standard implementation of ExtractedDatabaseMetaData

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.env.internal;
+package org.hibernate.engine.jdbc.env.internal;
 
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -44,15 +44,15 @@ import org.hibernate.exception.internal.SQLStateConversionDelegate;
 import org.hibernate.exception.internal.StandardSQLExceptionConverter;
 import org.hibernate.exception.spi.SQLExceptionConverter;
 import org.hibernate.metamodel.spi.relational.Identifier;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
-import org.hibernate.service.jdbc.env.spi.ExtractedDatabaseMetaData;
+import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData;
-import org.hibernate.service.jdbc.env.spi.IdentifierHelper;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.jdbc.env.spi.LobCreatorBuilder;
+import org.hibernate.engine.jdbc.env.spi.LobCreatorBuilder;
-import org.hibernate.service.jdbc.env.spi.QualifiedObjectNameSupport;
+import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameSupport;
-import org.hibernate.service.jdbc.env.spi.SQLStateType;
+import org.hibernate.engine.jdbc.env.spi.SQLStateType;
-import org.hibernate.service.jdbc.env.spi.SchemaNameResolver;
+import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver;
-import org.hibernate.service.jdbc.env.spi.StandardQualifiedObjectNameSupportImpl;
+import org.hibernate.engine.jdbc.env.spi.StandardQualifiedObjectNameSupportImpl;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 /**

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.env.internal;
+package org.hibernate.engine.jdbc.env.internal;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -37,8 +37,8 @@ import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
 import org.hibernate.engine.jdbc.dialect.spi.DialectFactory;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 /**

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.env.internal;
+package org.hibernate.engine.jdbc.env.internal;
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
@@ -38,7 +38,7 @@ import org.hibernate.engine.jdbc.LobCreator;
 import org.hibernate.engine.jdbc.NonContextualLobCreator;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.service.jdbc.env.spi.LobCreatorBuilder;
+import org.hibernate.engine.jdbc.env.spi.LobCreatorBuilder;
 
 /**
  * Builds {@link LobCreator} instances based on the capabilities of the environment.

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java

@@ -21,14 +21,14 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.env.internal;
+package org.hibernate.engine.jdbc.env.internal;
 
 import org.jboss.logging.Logger;
 
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.metamodel.spi.relational.Identifier;
-import org.hibernate.service.jdbc.env.spi.IdentifierHelper;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 
 /**
 * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/TemporarySchemaNameResolver.java

@@ -21,14 +21,14 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.env.internal;
+package org.hibernate.engine.jdbc.env.internal;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import org.hibernate.service.jdbc.env.spi.SchemaNameResolver;
+import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver;
 
 /**
  * Temporary implementation that works for H2.

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/package-info.java

@@ -0,0 +1 @@
+package org.hibernate.engine.jdbc.env;

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.env.spi;
+package org.hibernate.engine.jdbc.env.spi;
 
 /**
  * Information extracted from {@link java.sql.DatabaseMetaData} regarding what the JDBC driver reports as

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.env.spi;
+package org.hibernate.engine.jdbc.env.spi;
 
 import org.hibernate.metamodel.spi.relational.Identifier;
 

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java

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

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/LobCreatorBuilder.java

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

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/QualifiedObjectNameSupport.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.env.spi;
+package org.hibernate.engine.jdbc.env.spi;
 
 import org.hibernate.metamodel.spi.relational.ObjectName;
 

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.jdbc.env.spi;
+package org.hibernate.engine.jdbc.env.spi;
 
 /**
  * Enum interpretation of the valid values from {@link java.sql.DatabaseMetaData#getSQLStateType()}

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java

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

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/StandardQualifiedObjectNameSupportImpl.java

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

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

@@ -35,8 +35,8 @@ import org.hibernate.engine.jdbc.spi.ResultSetWrapper;
 import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
 import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
 import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.service.jdbc.env.spi.ExtractedDatabaseMetaData;
+import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.service.spi.Configurable;
 import org.hibernate.service.spi.ServiceRegistryAwareService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;

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

@@ -46,7 +46,7 @@ import org.hibernate.engine.jdbc.spi.NonDurableConnectionObserver;
 import org.hibernate.engine.transaction.spi.TransactionContext;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.collections.CollectionHelper;
-import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 
 /**
  * Standard Hibernate {@link org.hibernate.engine.jdbc.spi.LogicalConnection} implementation

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

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

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java

@@ -44,7 +44,7 @@ import org.hibernate.engine.transaction.spi.TransactionCoordinator;
 import org.hibernate.internal.CriteriaImpl;
 import org.hibernate.loader.custom.CustomQuery;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 import org.hibernate.type.Type;
 
 /**

hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jdbc/JdbcIsolationDelegate.java

@@ -35,7 +35,7 @@ import org.hibernate.engine.transaction.spi.TransactionCoordinator;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.jdbc.WorkExecutor;
 import org.hibernate.jdbc.WorkExecutorVisitable;
-import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 
 /**
  * The isolation delegate for JDBC {@link Connection} based transactions

hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaIsolationDelegate.java

@@ -39,7 +39,7 @@ import org.hibernate.engine.transaction.spi.TransactionCoordinator;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.jdbc.WorkExecutor;
 import org.hibernate.jdbc.WorkExecutorVisitable;
-import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 
 /**
  * An isolation delegate for JTA environments.

hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionContext.java

@@ -26,7 +26,7 @@ package org.hibernate.engine.transaction.spi;
 import java.io.Serializable;
 
 import org.hibernate.ConnectionReleaseMode;
-import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 
 /**
  * Access to services needed in the context of processing transaction requests.

hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java

@@ -56,7 +56,7 @@ import org.hibernate.jdbc.WorkExecutorVisitable;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
-import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 import org.hibernate.type.Type;
 
 /**

hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java

@@ -48,7 +48,7 @@ import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.service.spi.InjectService;
 
 /**

hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java

@@ -617,54 +617,6 @@ public final class SessionFactoryImpl
 		return JpaMetaModelPopulationSetting.parse( setting );
 	}
 
-	@SuppressWarnings({ "unchecked" })
-	private CustomEntityDirtinessStrategy determineCustomEntityDirtinessStrategy() {
-		CustomEntityDirtinessStrategy defaultValue = new CustomEntityDirtinessStrategy() {
-			@Override
-			public boolean canDirtyCheck(Object entity, EntityPersister persister, Session session) {
-				return false;
-			}
-
-			@Override
-			public boolean isDirty(Object entity, EntityPersister persister, Session session) {
-				return false;
-			}
-
-			@Override
-			public void resetDirty(Object entity, EntityPersister persister, Session session) {
-			}
-
-			@Override
-			public void findDirty(
-					Object entity,
-					EntityPersister persister,
-					Session session,
-					DirtyCheckContext dirtyCheckContext) {
-				// todo : implement proper method body
-			}
-		};
-		return serviceRegistry.getService( ConfigurationService.class ).getSetting(
-				AvailableSettings.CUSTOM_ENTITY_DIRTINESS_STRATEGY,
-				CustomEntityDirtinessStrategy.class,
-				defaultValue
-		);
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	private CurrentTenantIdentifierResolver determineCurrentTenantIdentifierResolver(
-			CurrentTenantIdentifierResolver explicitResolver) {
-		if ( explicitResolver != null ) {
-			return explicitResolver;
-		}
-		return serviceRegistry.getService( ConfigurationService.class )
-				.getSetting(
-						AvailableSettings.MULTI_TENANT_IDENTIFIER_RESOLVER,
-						CurrentTenantIdentifierResolver.class,
-						null
-				);
-
-	}
-
 	@SuppressWarnings( {"ThrowableResultOfMethodCallIgnored"})
 	public SessionFactoryImpl(MetadataImplementor metadata,SessionFactoryOptions sessionFactoryOptions) throws HibernateException {
 		LOG.debug( "Building session factory" );

hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureCallImpl.java

@@ -54,7 +54,7 @@ import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.engine.jdbc.cursor.spi.RefCursorSupport;
-import org.hibernate.service.jdbc.env.spi.ExtractedDatabaseMetaData;
+import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData;
 import org.hibernate.type.DateType;
 import org.hibernate.type.ProcedureParameterExtractionAware;
 import org.hibernate.type.Type;

hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbMappingProcessor.java

@@ -59,7 +59,7 @@ import org.hibernate.jaxb.spi.orm.JaxbEntityMappings;
 import org.hibernate.metamodel.spi.source.MappingException;
 import org.hibernate.metamodel.spi.source.XsdException;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 
 /**
  * Loads {@code hbm.xml} and {@code orm.xml} files and processes them using StAX and JAXB.

hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java

@@ -42,7 +42,7 @@ import org.hibernate.metamodel.MetadataSources;
 import org.hibernate.metamodel.spi.MetadataSourcesContributor;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.engine.config.spi.ConfigurationService;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Database.java

@@ -30,7 +30,7 @@ import java.util.Map;
 
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.metamodel.Metadata;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 
 /**
  * Represents a database and manages the named schema/catalog pairs defined within.

hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Exportable.java

@@ -28,7 +28,7 @@ package org.hibernate.metamodel.spi.relational;
  *
  * @author Steve Ebersole
  *
- * @see org.hibernate.service.schema.spi.Exporter
+ * @see org.hibernate.tool.schema.spi.Exporter
  */
 public interface Exportable {
 	/**

hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/ObjectName.java

@@ -47,7 +47,7 @@ public class ObjectName {
 	/**
 	 * Tries to create an {@code ObjectName} from a name.  This form explicitly looks for the form
 	 * {@code catalog.schema.name}.  If you need db specific parsing use
-	 * {@link org.hibernate.service.jdbc.env.spi.QualifiedObjectNameSupport#parseName} instead
+	 * {@link org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameSupport#parseName} instead
 	 *
 	 * @param text simple or qualified name of the database object.
 	 */

hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Table.java

@@ -30,9 +30,9 @@ import java.util.List;
 import java.util.Set;
 
 import org.hibernate.dialect.Dialect;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.ColumnInformation;
+import org.hibernate.tool.schema.spi.ColumnInformation;
-import org.hibernate.service.schema.spi.TableInformation;
+import org.hibernate.tool.schema.spi.TableInformation;
 
 /**
  * Models the concept of a relational <tt>TABLE</tt> (or <tt>VIEW</tt>).

hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java

@@ -28,25 +28,25 @@ import java.util.Collections;
 import java.util.List;
 
 import org.hibernate.boot.registry.StandardServiceInitiator;
-import org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator;
-import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
-import org.hibernate.engine.transaction.internal.TransactionFactoryInitiator;
-import org.hibernate.id.factory.internal.MutableIdentifierGeneratorFactoryInitiator;
-import org.hibernate.persister.internal.PersisterClassResolverInitiator;
-import org.hibernate.persister.internal.PersisterFactoryInitiator;
 import org.hibernate.engine.config.internal.ConfigurationServiceInitiator;
-import org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryInitiator;
+import org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator;
 import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
 import org.hibernate.engine.jdbc.connections.internal.MultiTenantConnectionProviderInitiator;
 import org.hibernate.engine.jdbc.cursor.internal.RefCursorSupportInitiator;
 import org.hibernate.engine.jdbc.dialect.internal.DialectFactoryInitiator;
 import org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator;
-import org.hibernate.jmx.internal.JmxServiceInitiator;
+import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
+import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
 import org.hibernate.engine.jndi.internal.JndiServiceInitiator;
+import org.hibernate.engine.transaction.internal.TransactionFactoryInitiator;
 import org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator;
-import org.hibernate.service.jdbc.env.internal.JdbcEnvironmentInitiator;
+import org.hibernate.id.factory.internal.MutableIdentifierGeneratorFactoryInitiator;
-import org.hibernate.service.schema.internal.SchemaManagementToolInitiator;
+import org.hibernate.jmx.internal.JmxServiceInitiator;
+import org.hibernate.persister.internal.PersisterClassResolverInitiator;
+import org.hibernate.persister.internal.PersisterFactoryInitiator;
+import org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryInitiator;
 import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractorInitiator;
+import org.hibernate.tool.schema.internal.SchemaManagementToolInitiator;
 
 /**
  * Central definition of the standard set of service initiators defined by Hibernate.

hibernate-core/src/main/java/org/hibernate/service/jdbc/env/package-info.java

@@ -1 +0,0 @@
-package org.hibernate.service.jdbc.env;

hibernate-core/src/main/java/org/hibernate/service/schema/package-info.java

@@ -1 +0,0 @@
-package org.hibernate.service.schema;

hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java

@@ -33,7 +33,7 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.metamodel.spi.MetadataImplementor;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.service.spi.SessionFactoryServiceInitiator;
 import org.hibernate.stat.spi.StatisticsFactory;
@@ -73,7 +73,7 @@ public class StatisticsInitiator implements SessionFactoryServiceInitiator<Stati
 			MetadataImplementor metadata,
 			ServiceRegistryImplementor registry) {
 		ConfigurationService configurationService =  registry.getService( ConfigurationService.class );
-		final Object configValue = configurationService.getSetting( STATS_BUILDER, null );
+		final Object configValue = configurationService.getSetting( STATS_BUILDER );
 		return initiateServiceInternal( sessionFactory, configValue, registry );
 	}
 

hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java

@@ -64,7 +64,7 @@ import org.hibernate.service.ServiceRegistry;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.service.schema.spi.SchemaManagementTool;
+import org.hibernate.tool.schema.spi.SchemaManagementTool;
 
 /**
  * Commandline tool to export table schema to the database. This class may also be called from inside an application.
@@ -153,7 +153,7 @@ public class SchemaExport {
 
 		SchemaManagementTool schemaManagementTool = serviceRegistry.getService( SchemaManagementTool.class );
 		final List<String> commands = new ArrayList<String>();
-		final org.hibernate.service.schema.spi.Target target = new org.hibernate.service.schema.spi.Target() {
+		final org.hibernate.tool.schema.spi.Target target = new org.hibernate.tool.schema.spi.Target() {
 			@Override
 			public boolean acceptsImportScriptActions() {
 				return false;

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnInformationImpl.java

@@ -21,12 +21,12 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import org.hibernate.TruthValue;
 import org.hibernate.metamodel.spi.relational.Identifier;
-import org.hibernate.service.schema.spi.ColumnInformation;
+import org.hibernate.tool.schema.spi.ColumnInformation;
-import org.hibernate.service.schema.spi.TableInformation;
+import org.hibernate.tool.schema.spi.TableInformation;
 
 /**
  * JDBC column metadata

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DatabaseInformationImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -34,13 +34,13 @@ import org.hibernate.TruthValue;
 import org.hibernate.metamodel.spi.relational.Identifier;
 import org.hibernate.metamodel.spi.relational.ObjectName;
 import org.hibernate.metamodel.spi.relational.Schema;
-import org.hibernate.service.jdbc.env.spi.IdentifierHelper;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.ColumnInformation;
+import org.hibernate.tool.schema.spi.ColumnInformation;
-import org.hibernate.service.schema.spi.DatabaseInformation;
+import org.hibernate.tool.schema.spi.DatabaseInformation;
-import org.hibernate.service.schema.spi.SchemaManagementException;
+import org.hibernate.tool.schema.spi.SchemaManagementException;
-import org.hibernate.service.schema.spi.SequenceInformation;
+import org.hibernate.tool.schema.spi.SequenceInformation;
-import org.hibernate.service.schema.spi.TableInformation;
+import org.hibernate.tool.schema.spi.TableInformation;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ForeignKeyInformationImpl.java

@@ -21,15 +21,15 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.hibernate.metamodel.spi.relational.Identifier;
-import org.hibernate.service.schema.spi.ColumnInformation;
+import org.hibernate.tool.schema.spi.ColumnInformation;
-import org.hibernate.service.schema.spi.ForeignKeyInformation;
+import org.hibernate.tool.schema.spi.ForeignKeyInformation;
-import org.hibernate.service.schema.spi.SchemaManagementException;
+import org.hibernate.tool.schema.spi.SchemaManagementException;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/HibernateSchemaManagementTool.java

@@ -21,15 +21,15 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.util.Map;
 
-import org.hibernate.service.schema.spi.SchemaCreator;
+import org.hibernate.tool.schema.spi.SchemaCreator;
-import org.hibernate.service.schema.spi.SchemaDropper;
+import org.hibernate.tool.schema.spi.SchemaDropper;
-import org.hibernate.service.schema.spi.SchemaManagementTool;
+import org.hibernate.tool.schema.spi.SchemaManagementTool;
-import org.hibernate.service.schema.spi.SchemaMigrator;
+import org.hibernate.tool.schema.spi.SchemaMigrator;
-import org.hibernate.service.schema.spi.SchemaValidator;
+import org.hibernate.tool.schema.spi.SchemaValidator;
 
 /**
  * The standard Hibernate implementation for performing schema management.

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndexInformationImpl.java

@@ -21,16 +21,16 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.hibernate.metamodel.spi.relational.Identifier;
-import org.hibernate.service.schema.spi.ColumnInformation;
+import org.hibernate.tool.schema.spi.ColumnInformation;
-import org.hibernate.service.schema.spi.IndexInformation;
+import org.hibernate.tool.schema.spi.IndexInformation;
-import org.hibernate.service.schema.spi.SchemaManagementException;
+import org.hibernate.tool.schema.spi.SchemaManagementException;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.util.HashSet;
 import java.util.List;
@@ -38,10 +38,10 @@ import org.hibernate.metamodel.spi.relational.Schema;
 import org.hibernate.metamodel.spi.relational.Sequence;
 import org.hibernate.metamodel.spi.relational.Table;
 import org.hibernate.metamodel.spi.relational.UniqueKey;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.SchemaCreator;
+import org.hibernate.tool.schema.spi.SchemaCreator;
-import org.hibernate.service.schema.spi.SchemaManagementException;
+import org.hibernate.tool.schema.spi.SchemaManagementException;
-import org.hibernate.service.schema.spi.Target;
+import org.hibernate.tool.schema.spi.Target;
 
 /**
  * This is functionally nothing more than the creation script from the older SchemaExport class (plus some

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.util.HashSet;
 import java.util.List;
@@ -37,10 +37,10 @@ import org.hibernate.metamodel.spi.relational.Schema;
 import org.hibernate.metamodel.spi.relational.Sequence;
 import org.hibernate.metamodel.spi.relational.Table;
 import org.hibernate.metamodel.spi.relational.UniqueKey;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.SchemaDropper;
+import org.hibernate.tool.schema.spi.SchemaDropper;
-import org.hibernate.service.schema.spi.SchemaManagementException;
+import org.hibernate.tool.schema.spi.SchemaManagementException;
-import org.hibernate.service.schema.spi.Target;
+import org.hibernate.tool.schema.spi.Target;
 
 /**
  * This is functionally nothing more than the creation script from the older SchemaExport class (plus some

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaManagementToolInitiator.java

@@ -21,14 +21,14 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.util.Map;
 
 import org.hibernate.boot.registry.StandardServiceInitiator;
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.service.schema.spi.SchemaManagementTool;
+import org.hibernate.tool.schema.spi.SchemaManagementTool;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 /**

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaMigratorImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.util.HashSet;
 import java.util.List;
@@ -35,14 +35,14 @@ import org.hibernate.metamodel.spi.relational.Index;
 import org.hibernate.metamodel.spi.relational.Schema;
 import org.hibernate.metamodel.spi.relational.Sequence;
 import org.hibernate.metamodel.spi.relational.Table;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.DatabaseInformation;
+import org.hibernate.tool.schema.spi.DatabaseInformation;
-import org.hibernate.service.schema.spi.ForeignKeyInformation;
+import org.hibernate.tool.schema.spi.ForeignKeyInformation;
-import org.hibernate.service.schema.spi.SchemaManagementException;
+import org.hibernate.tool.schema.spi.SchemaManagementException;
-import org.hibernate.service.schema.spi.SchemaMigrator;
+import org.hibernate.tool.schema.spi.SchemaMigrator;
-import org.hibernate.service.schema.spi.SequenceInformation;
+import org.hibernate.tool.schema.spi.SequenceInformation;
-import org.hibernate.service.schema.spi.TableInformation;
+import org.hibernate.tool.schema.spi.TableInformation;
-import org.hibernate.service.schema.spi.Target;
+import org.hibernate.tool.schema.spi.Target;
 
 
 /**

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaValidatorImpl.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import org.hibernate.metamodel.spi.relational.Column;
 import org.hibernate.metamodel.spi.relational.Database;
@@ -29,12 +29,12 @@ import org.hibernate.metamodel.spi.relational.Schema;
 import org.hibernate.metamodel.spi.relational.Sequence;
 import org.hibernate.metamodel.spi.relational.Table;
 import org.hibernate.metamodel.spi.relational.Value;
-import org.hibernate.service.schema.spi.ColumnInformation;
+import org.hibernate.tool.schema.spi.ColumnInformation;
-import org.hibernate.service.schema.spi.DatabaseInformation;
+import org.hibernate.tool.schema.spi.DatabaseInformation;
-import org.hibernate.service.schema.spi.SchemaManagementException;
+import org.hibernate.tool.schema.spi.SchemaManagementException;
-import org.hibernate.service.schema.spi.SchemaValidator;
+import org.hibernate.tool.schema.spi.SchemaValidator;
-import org.hibernate.service.schema.spi.SequenceInformation;
+import org.hibernate.tool.schema.spi.SequenceInformation;
-import org.hibernate.service.schema.spi.TableInformation;
+import org.hibernate.tool.schema.spi.TableInformation;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SequenceInformationImpl.java

@@ -21,10 +21,10 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import org.hibernate.metamodel.spi.relational.ObjectName;
-import org.hibernate.service.schema.spi.SequenceInformation;
+import org.hibernate.tool.schema.spi.SequenceInformation;
 
 /**
  * For now we only collect sequence name.  If all databases support it, would really like to see INCREMENT here as well.

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java

@@ -21,12 +21,12 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.metamodel.spi.relational.AuxiliaryDatabaseObject;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.Exporter;
+import org.hibernate.tool.schema.spi.Exporter;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java

@@ -21,13 +21,13 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.metamodel.spi.relational.ForeignKey;
 import org.hibernate.metamodel.spi.relational.Table;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.Exporter;
+import org.hibernate.tool.schema.spi.Exporter;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardIndexExporter.java

@@ -21,15 +21,15 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.metamodel.spi.relational.Column;
 import org.hibernate.metamodel.spi.relational.Index;
 import org.hibernate.metamodel.spi.relational.Table;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.Exporter;
+import org.hibernate.tool.schema.spi.Exporter;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardSequenceExporter.java

@@ -21,12 +21,12 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.metamodel.spi.relational.Sequence;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.Exporter;
+import org.hibernate.tool.schema.spi.Exporter;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,8 +33,8 @@ import org.hibernate.metamodel.spi.relational.Size;
 import org.hibernate.metamodel.spi.relational.Table;
 import org.hibernate.metamodel.spi.relational.UniqueKey;
 import org.hibernate.metamodel.spi.relational.Value;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.Exporter;
+import org.hibernate.tool.schema.spi.Exporter;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUniqueKeyExporter.java

@@ -21,14 +21,14 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.metamodel.spi.relational.Column;
 import org.hibernate.metamodel.spi.relational.Table;
 import org.hibernate.metamodel.spi.relational.UniqueKey;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.Exporter;
+import org.hibernate.tool.schema.spi.Exporter;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TableInformationImpl.java

@@ -21,16 +21,16 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.util.Map;
 
 import org.hibernate.metamodel.spi.relational.Identifier;
 import org.hibernate.metamodel.spi.relational.ObjectName;
-import org.hibernate.service.schema.spi.ColumnInformation;
+import org.hibernate.tool.schema.spi.ColumnInformation;
-import org.hibernate.service.schema.spi.ForeignKeyInformation;
+import org.hibernate.tool.schema.spi.ForeignKeyInformation;
-import org.hibernate.service.schema.spi.IndexInformation;
+import org.hibernate.tool.schema.spi.IndexInformation;
-import org.hibernate.service.schema.spi.TableInformation;
+import org.hibernate.tool.schema.spi.TableInformation;
 
 /**
  * Provides access to information about existing schema objects (tables, sequences etc) of existing database.

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TemporarySequenceInformationExtractor.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.internal;
+package org.hibernate.tool.schema.internal;
 
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -31,9 +31,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.hibernate.metamodel.spi.relational.ObjectName;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.spi.SequenceInformation;
+import org.hibernate.tool.schema.spi.SequenceInformation;
-import org.hibernate.service.schema.spi.SequenceInformationExtractor;
+import org.hibernate.tool.schema.spi.SequenceInformationExtractor;
 
 /**
  * Temporary implementation that works for H2.

hibernate-core/src/main/java/org/hibernate/tool/schema/package-info.java

@@ -0,0 +1 @@
+package org.hibernate.tool.schema;

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ColumnInformation.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.spi;
+package org.hibernate.tool.schema.spi;
 
 import org.hibernate.TruthValue;
 import org.hibernate.metamodel.spi.relational.Identifier;

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DatabaseInformation.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.spi;
+package org.hibernate.tool.schema.spi;
 
 import org.hibernate.metamodel.spi.relational.ObjectName;
 

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Exporter.java

@@ -21,10 +21,10 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.spi;
+package org.hibernate.tool.schema.spi;
 
 import org.hibernate.metamodel.spi.relational.Exportable;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 
 /**
  * Defines a contract for exporting of database objects (tables, sequences, etc) for use in SQL {@code CREATE} and

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ForeignKeyInformation.java

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

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/IndexInformation.java

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

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaCreator.java

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

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaDropper.java

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

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementException.java

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

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementTool.java

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

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaMigrator.java

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

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaValidator.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.spi;
+package org.hibernate.tool.schema.spi;
 
 import org.hibernate.metamodel.spi.relational.Database;
 

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SequenceInformation.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.spi;
+package org.hibernate.tool.schema.spi;
 
 import org.hibernate.metamodel.spi.relational.ObjectName;
 

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SequenceInformationExtractor.java

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

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TableInformation.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.spi;
+package org.hibernate.tool.schema.spi;
 
 import org.hibernate.metamodel.spi.relational.Identifier;
 import org.hibernate.metamodel.spi.relational.ObjectName;

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Target.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.service.schema.spi;
+package org.hibernate.tool.schema.spi;
 
 /**
  * Describes the target of schema management actions.  Typically this would be a stream/writer or the database

hibernate-core/src/test/java/org/hibernate/jdbc/LobCreatorTest.java

@@ -50,7 +50,7 @@ import org.hibernate.engine.jdbc.NClobImplementer;
 import org.hibernate.engine.jdbc.NonContextualLobCreator;
 import org.hibernate.engine.jdbc.WrappedBlob;
 import org.hibernate.engine.jdbc.WrappedClob;
-import org.hibernate.service.jdbc.env.internal.LobCreatorBuilderImpl;
+import org.hibernate.engine.jdbc.env.internal.LobCreatorBuilderImpl;
 
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;

hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java

@@ -46,6 +46,7 @@ public class EagerKeyManyToOneTest extends BaseCoreFunctionalTestCase {
 		return new Class[] { Card.class, CardField.class, Key.class, PrimaryKey.class };
 	}
 
+
 	@Test
 	@TestForIssue( jiraKey = "HHH-4147" )
 	@FailureExpectedWithNewMetamodel

hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java

@@ -37,13 +37,13 @@ import org.hibernate.engine.jdbc.spi.ResultSetWrapper;
 import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
 import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
 import org.hibernate.metamodel.spi.relational.Identifier;
-import org.hibernate.service.jdbc.env.internal.ExtractedDatabaseMetaDataImpl;
+import org.hibernate.engine.jdbc.env.internal.ExtractedDatabaseMetaDataImpl;
-import org.hibernate.service.jdbc.env.internal.LobCreatorBuilderImpl;
+import org.hibernate.engine.jdbc.env.internal.LobCreatorBuilderImpl;
-import org.hibernate.service.jdbc.env.spi.ExtractedDatabaseMetaData;
+import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData;
-import org.hibernate.service.jdbc.env.spi.IdentifierHelper;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.jdbc.env.spi.LobCreatorBuilder;
+import org.hibernate.engine.jdbc.env.spi.LobCreatorBuilder;
-import org.hibernate.service.jdbc.env.spi.QualifiedObjectNameSupport;
+import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameSupport;
 import org.hibernate.service.spi.Stoppable;
 import org.hibernate.testing.env.ConnectionProviderBuilder;
 

hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java

@@ -29,7 +29,7 @@ import java.sql.SQLException;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.engine.transaction.spi.TransactionEnvironment;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/test/java/org/hibernate/test/common/TransactionContextImpl.java

@@ -28,7 +28,7 @@ import org.hibernate.engine.transaction.spi.TransactionContext;
 import org.hibernate.engine.transaction.spi.TransactionEnvironment;
 import org.hibernate.engine.transaction.spi.TransactionImplementor;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/test/java/org/hibernate/test/engine/jdbc/env/StandardSchemaCatalogSupportImplTest.java

@@ -26,7 +26,7 @@ package org.hibernate.test.engine.jdbc.env;
 import org.junit.Test;
 
 import org.hibernate.metamodel.spi.relational.ObjectName;
-import org.hibernate.service.jdbc.env.spi.StandardQualifiedObjectNameSupportImpl;
+import org.hibernate.engine.jdbc.env.spi.StandardQualifiedObjectNameSupportImpl;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 
 import static org.junit.Assert.assertEquals;

hibernate-core/src/test/java/org/hibernate/test/service/schema/internal/ExistingDatabaseMetaDataImplTest.java

@@ -36,10 +36,10 @@ import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.metamodel.spi.relational.ObjectName;
 import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.jdbc.env.internal.JdbcEnvironmentImpl;
+import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentImpl;
-import org.hibernate.service.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.schema.internal.DatabaseInformationImpl;
+import org.hibernate.tool.schema.internal.DatabaseInformationImpl;
-import org.hibernate.service.schema.spi.DatabaseInformation;
+import org.hibernate.tool.schema.spi.DatabaseInformation;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 
@@ -105,7 +105,7 @@ public class ExistingDatabaseMetaDataImplTest extends BaseUnitTestCase {
 		assertNotNull( databaseMetaData.getSequenceInformation( name ) );
 
 		// knowing if identifiers coming back from the database are quoted is all dicked up...
-		// see org.hibernate.service.jdbc.env.internal.NormalizingIdentifierHelperImpl
+		// see org.hibernate.engine.jdbc.env.internal.NormalizingIdentifierHelperImpl
 		//
 		// surely JDBC has a better way to determine this right?
 	}

hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/EhCacheRegionFactory.java

@@ -34,9 +34,8 @@ import org.jboss.logging.Logger;
 
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.ehcache.internal.util.HibernateUtil;
-import org.hibernate.cfg.Settings;
 import org.hibernate.service.config.spi.ConfigurationService;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 
 /**
  * A non-singleton EhCacheRegionFactory implementation.

hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/SingletonEhCacheRegionFactory.java

@@ -34,9 +34,8 @@ import org.jboss.logging.Logger;
 
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.ehcache.internal.util.HibernateUtil;
-import org.hibernate.cfg.Settings;
 import org.hibernate.service.config.spi.ConfigurationService;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 
 /**
  * A singleton EhCacheRegionFactory implementation.

hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/spi/JpaUnifiedSettingsBuilder.java

@@ -36,7 +36,7 @@ import org.hibernate.jaxb.spi.cfg.JaxbHibernateConfiguration;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.ValueHolder;
 import org.hibernate.jpa.AvailableSettings;
-import org.hibernate.service.ConfigLoader;
+import org.hibernate.boot.registry.internal.ConfigLoader;
 
 import static org.hibernate.jaxb.spi.cfg.JaxbHibernateConfiguration.JaxbSessionFactory.JaxbMapping;
 

hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java

@@ -38,7 +38,7 @@ import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
 import org.hibernate.cache.spi.CacheKey;
 import org.hibernate.collection.spi.PersistentCollection;
-import org.hibernate.service.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 import org.hibernate.engine.query.spi.sql.NativeSQLQuerySpecification;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.LoadQueryInfluencers;

hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java

@@ -36,7 +36,7 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.metamodel.spi.MetadataImplementor;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.service.spi.SessionFactoryServiceRegistry;
 
 /**

hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java

@@ -47,7 +47,7 @@ import org.hibernate.cfg.Settings;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.service.config.spi.ConfigurationService;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 
 /**
  * A {@link RegionFactory} for <a href="http://www.jboss.org/infinispan">Infinispan</a>-backed cache

hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java

@@ -21,23 +21,12 @@
  */
 package org.hibernate.cache.infinispan;
 
-import java.util.Properties;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
 import org.infinispan.manager.EmbeddedCacheManager;
-import org.infinispan.util.logging.Log;
-import org.infinispan.util.logging.LogFactory;
 
 import org.hibernate.cache.CacheException;
-import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.internal.util.jndi.JndiHelper;
 import org.hibernate.service.config.spi.ConfigurationService;
-import org.hibernate.service.config.spi.StandardConverters;
+import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.service.jndi.spi.JndiService;
-import org.hibernate.service.spi.ServiceRegistryAwareService;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 /**
  * A {@link org.hibernate.cache.spi.RegionFactory} for <a href="http://www.jboss.org/infinispan">Infinispan</a>-backed cache