From ec16599411f371aeccd105428ce71e0f21ca838e Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Mon, 10 Sep 2012 15:46:11 -0500 Subject: [PATCH] HHH-7556 - Clean up packages --- .../StandardServiceRegistryBuilder.java | 2 +- .../registry/internal}/ConfigLoader.java | 2 +- .../internal/RegionFactoryInitiator.java | 5 +- .../cache/internal/StandardQueryCache.java | 2 +- .../cache/spi/AbstractRegionFactory.java | 2 +- .../org/hibernate/cfg/AvailableSettings.java | 4 +- .../org/hibernate/cfg/SettingsFactory.java | 2 +- .../java/org/hibernate/dialect/Dialect.java | 14 ++-- .../internal/ConfigurationServiceImpl.java | 65 ++++--------------- .../config/spi/ConfigurationService.java | 10 +-- .../config/spi/StandardConverters.java | 2 +- .../UserSuppliedConnectionException.java | 2 +- .../UserSuppliedConnectionProviderImpl.java | 1 - .../connections/spi/JdbcConnectionAccess.java | 2 +- .../ExtractedDatabaseMetaDataImpl.java | 8 +-- .../env/internal/JdbcEnvironmentImpl.java | 20 +++--- .../internal/JdbcEnvironmentInitiator.java | 6 +- .../env/internal/LobCreatorBuilderImpl.java | 4 +- .../NormalizingIdentifierHelperImpl.java | 6 +- .../internal/TemporarySchemaNameResolver.java | 4 +- .../engine/jdbc/env/package-info.java | 1 + .../env/spi/ExtractedDatabaseMetaData.java | 2 +- .../jdbc/env/spi/IdentifierHelper.java | 2 +- .../jdbc/env/spi/JdbcEnvironment.java | 2 +- .../jdbc/env/spi/LobCreatorBuilder.java | 2 +- .../env/spi/QualifiedObjectNameSupport.java | 2 +- .../jdbc/env/spi/SQLStateType.java | 2 +- .../jdbc/env/spi/SchemaNameResolver.java | 2 +- ...tandardQualifiedObjectNameSupportImpl.java | 2 +- .../jdbc/internal/JdbcServicesImpl.java | 4 +- .../jdbc/internal/LogicalConnectionImpl.java | 2 +- .../engine/jdbc/spi/JdbcServices.java | 4 +- .../engine/spi/SessionImplementor.java | 2 +- .../internal/jdbc/JdbcIsolationDelegate.java | 2 +- .../internal/jta/JtaIsolationDelegate.java | 2 +- .../transaction/spi/TransactionContext.java | 2 +- .../internal/AbstractSessionImpl.java | 2 +- .../org/hibernate/internal/CacheImpl.java | 2 +- .../internal/SessionFactoryImpl.java | 48 -------------- .../internal/StoredProcedureCallImpl.java | 2 +- .../jaxb/internal/JaxbMappingProcessor.java | 2 +- .../internal/MetadataBuilderImpl.java | 2 +- .../metamodel/spi/relational/Database.java | 2 +- .../metamodel/spi/relational/Exportable.java | 2 +- .../metamodel/spi/relational/ObjectName.java | 2 +- .../metamodel/spi/relational/Table.java | 6 +- .../service/StandardServiceInitiators.java | 20 +++--- .../service/jdbc/env/package-info.java | 1 - .../service/schema/package-info.java | 1 - .../stat/internal/StatisticsInitiator.java | 4 +- .../hibernate/tool/hbm2ddl/SchemaExport.java | 4 +- .../internal/ColumnInformationImpl.java | 6 +- .../internal/DatabaseInformationImpl.java | 16 ++--- .../internal/ForeignKeyInformationImpl.java | 8 +-- .../HibernateSchemaManagementTool.java | 12 ++-- .../schema/internal/IndexInformationImpl.java | 8 +-- .../schema/internal/SchemaCreatorImpl.java | 10 +-- .../schema/internal/SchemaDropperImpl.java | 10 +-- .../SchemaManagementToolInitiator.java | 4 +- .../schema/internal/SchemaMigratorImpl.java | 18 ++--- .../schema/internal/SchemaValidatorImpl.java | 14 ++-- .../internal/SequenceInformationImpl.java | 4 +- ...andardAuxiliaryDatabaseObjectExporter.java | 6 +- .../internal/StandardForeignKeyExporter.java | 6 +- .../internal/StandardIndexExporter.java | 6 +- .../internal/StandardSequenceExporter.java | 6 +- .../internal/StandardTableExporter.java | 6 +- .../internal/StandardUniqueKeyExporter.java | 6 +- .../schema/internal/TableInformationImpl.java | 10 +-- ...TemporarySequenceInformationExtractor.java | 8 +-- .../hibernate/tool/schema/package-info.java | 1 + .../schema/spi/ColumnInformation.java | 2 +- .../schema/spi/DatabaseInformation.java | 2 +- .../schema/spi/Exporter.java | 4 +- .../schema/spi/ForeignKeyInformation.java | 2 +- .../schema/spi/IndexInformation.java | 2 +- .../schema/spi/SchemaCreator.java | 2 +- .../schema/spi/SchemaDropper.java | 2 +- .../schema/spi/SchemaManagementException.java | 2 +- .../schema/spi/SchemaManagementTool.java | 2 +- .../schema/spi/SchemaMigrator.java | 2 +- .../schema/spi/SchemaValidator.java | 2 +- .../schema/spi/SequenceInformation.java | 2 +- .../spi/SequenceInformationExtractor.java | 2 +- .../schema/spi/TableInformation.java | 2 +- .../{service => tool}/schema/spi/Target.java | 2 +- .../org/hibernate/jdbc/LobCreatorTest.java | 2 +- .../keymanytoone/EagerKeyManyToOneTest.java | 1 + .../common/BasicTestingJdbcServiceImpl.java | 14 ++-- .../test/common/JdbcConnectionAccessImpl.java | 2 +- .../test/common/TransactionContextImpl.java | 2 +- .../StandardSchemaCatalogSupportImplTest.java | 2 +- .../ExistingDatabaseMetaDataImplTest.java | 10 +-- .../cache/ehcache/EhCacheRegionFactory.java | 3 +- .../SingletonEhCacheRegionFactory.java | 3 +- .../boot/spi/JpaUnifiedSettingsBuilder.java | 2 +- .../AbstractDelegateSessionImplementor.java | 2 +- .../envers/event/EnversIntegrator.java | 2 +- .../infinispan/InfinispanRegionFactory.java | 2 +- .../JndiInfinispanRegionFactory.java | 13 +--- .../cluster/ClusterAwareRegionFactory.java | 4 +- 101 files changed, 225 insertions(+), 334 deletions(-) rename hibernate-core/src/main/java/org/hibernate/{service => boot/registry/internal}/ConfigLoader.java (98%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/config/spi/StandardConverters.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/connections/internal/UserSuppliedConnectionException.java (95%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/connections/spi/JdbcConnectionAccess.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java (95%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/internal/JdbcEnvironmentImpl.java (94%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/internal/JdbcEnvironmentInitiator.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/internal/LobCreatorBuilderImpl.java (98%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/internal/NormalizingIdentifierHelperImpl.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/internal/TemporarySchemaNameResolver.java (94%) create mode 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/package-info.java rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/spi/ExtractedDatabaseMetaData.java (98%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/spi/IdentifierHelper.java (98%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/spi/JdbcEnvironment.java (98%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/spi/LobCreatorBuilder.java (96%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/spi/QualifiedObjectNameSupport.java (98%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/spi/SQLStateType.java (96%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/spi/SchemaNameResolver.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => engine}/jdbc/env/spi/StandardQualifiedObjectNameSupportImpl.java (99%) delete mode 100644 hibernate-core/src/main/java/org/hibernate/service/jdbc/env/package-info.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/service/schema/package-info.java rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/ColumnInformationImpl.java (94%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/DatabaseInformationImpl.java (96%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/ForeignKeyInformationImpl.java (93%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/HibernateSchemaManagementTool.java (83%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/IndexInformationImpl.java (91%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/SchemaCreatorImpl.java (95%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/SchemaDropperImpl.java (95%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/SchemaManagementToolInitiator.java (95%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/SchemaMigratorImpl.java (91%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/SchemaValidatorImpl.java (91%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/SequenceInformationImpl.java (94%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java (91%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/StandardForeignKeyExporter.java (96%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/StandardIndexExporter.java (94%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/StandardSequenceExporter.java (92%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/StandardTableExporter.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/StandardUniqueKeyExporter.java (95%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/TableInformationImpl.java (91%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/internal/TemporarySequenceInformationExtractor.java (92%) create mode 100644 hibernate-core/src/main/java/org/hibernate/tool/schema/package-info.java rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/ColumnInformation.java (98%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/DatabaseInformation.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/Exporter.java (94%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/ForeignKeyInformation.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/IndexInformation.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/SchemaCreator.java (98%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/SchemaDropper.java (98%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/SchemaManagementException.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/SchemaManagementTool.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/SchemaMigrator.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/SchemaValidator.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/SequenceInformation.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/SequenceInformationExtractor.java (97%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/TableInformation.java (98%) rename hibernate-core/src/main/java/org/hibernate/{service => tool}/schema/spi/Target.java (98%) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java index 04b50fdf82..de8c3b0bf8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/internal/ConfigLoader.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java rename to hibernate-core/src/main/java/org/hibernate/boot/registry/internal/ConfigLoader.java index 598625506d..e2639a4dcb 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java index f4346f19d2..0c42a87a74 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java +++ b/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.service.spi.ServiceException; +import org.hibernate.engine.config.spi.StandardConverters; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.SessionFactoryServiceInitiator; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/StandardQueryCache.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/StandardQueryCache.java index 6b1cc74e18..fdcea19270 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/StandardQueryCache.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractRegionFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractRegionFactory.java index 43faa5a6cd..7fe1e91e95 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractRegionFactory.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java index 3241b14c2a..e25c11aef1 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java +++ b/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 - * schema management. The default is to use {@link org.hibernate.service.schema.internal.HibernateSchemaManagementTool} + * 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.tool.schema.internal.HibernateSchemaManagementTool} * * @since 5.0 */ diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java b/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java index adee169384..7926e47d60 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java +++ b/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; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index ffcefaaa68..288fabf6e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/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.service.schema.internal.StandardForeignKeyExporter; -import org.hibernate.service.schema.internal.StandardIndexExporter; -import org.hibernate.service.schema.internal.StandardSequenceExporter; -import org.hibernate.service.schema.internal.StandardTableExporter; -import org.hibernate.service.schema.internal.StandardUniqueKeyExporter; -import org.hibernate.service.schema.spi.Exporter; +import org.hibernate.tool.schema.internal.StandardAuxiliaryDatabaseObjectExporter; +import org.hibernate.tool.schema.internal.StandardForeignKeyExporter; +import org.hibernate.tool.schema.internal.StandardIndexExporter; +import org.hibernate.tool.schema.internal.StandardSequenceExporter; +import org.hibernate.tool.schema.internal.StandardTableExporter; +import org.hibernate.tool.schema.internal.StandardUniqueKeyExporter; +import org.hibernate.tool.schema.spi.Exporter; import org.hibernate.sql.ANSICaseFragment; import org.hibernate.sql.ANSIJoinFragment; import org.hibernate.sql.CaseFragment; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java index 5118c5e782..c8f00059df 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java +++ b/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 { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( - CoreMessageLogger.class, - ConfigurationServiceImpl.class.getName() - ); +public class ConfigurationServiceImpl implements ConfigurationService { 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) { - this.serviceRegistry = serviceRegistry; + @SuppressWarnings("unchecked") + public 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 getSetting(String name, Class expectedType) { + return getSetting( name, expectedType, null ); + } + @Override public T getSetting(String name, Converter 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 getSetting(String name, Class expected, T defaultValue) { Object value = settings.get( name ); - T target = cast( expected, value ); - return target !=null ? target : defaultValue; + return value == null + ? defaultValue + : (T) value; } - @Override - public T cast(Class expected, Object candidate){ - if(candidate == null) return null; - if ( expected.isInstance( candidate ) ) { - return (T) candidate; - } - Class 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; - } - - } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java b/hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java index de5a4fb955..c988fb3dd7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java +++ b/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 getSetting(String name); public T getSetting(String name, Converter converter); + public T getSetting(String name, Class expectedType); public T getSetting(String name, Converter converter, T defaultValue); public T getSetting(String name, Class expected, T defaultValue); - /** - * Cast candidate to the instance of expected 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 cast(Class expected, Object candidate); public static interface Converter { public T convert(Object value); } diff --git a/hibernate-core/src/main/java/org/hibernate/service/config/spi/StandardConverters.java b/hibernate-core/src/main/java/org/hibernate/engine/config/spi/StandardConverters.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/config/spi/StandardConverters.java rename to hibernate-core/src/main/java/org/hibernate/engine/config/spi/StandardConverters.java index 664ca86366..c7ac6ce850 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/config/spi/StandardConverters.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/UserSuppliedConnectionException.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionException.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/UserSuppliedConnectionException.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionException.java index 741ebb8cef..dc4862746d 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/UserSuppliedConnectionException.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java index 2d284ee199..98009b30da 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java +++ b/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 diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/JdbcConnectionAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/JdbcConnectionAccess.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java index 1fa6f1f49a..0b4493c8bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/JdbcConnectionAccess.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java index 88dce69484..14dfc94899 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java +++ b/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.service.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.service.jdbc.env.spi.SQLStateType; +import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.engine.jdbc.env.spi.SQLStateType; /** * Standard implementation of ExtractedDatabaseMetaData diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentImpl.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java index 8a1f721741..cd7c9e7144 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentImpl.java +++ b/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.service.jdbc.env.spi.ExtractedDatabaseMetaData; -import org.hibernate.service.jdbc.env.spi.IdentifierHelper; -import org.hibernate.service.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.service.jdbc.env.spi.LobCreatorBuilder; -import org.hibernate.service.jdbc.env.spi.QualifiedObjectNameSupport; -import org.hibernate.service.jdbc.env.spi.SQLStateType; -import org.hibernate.service.jdbc.env.spi.SchemaNameResolver; -import org.hibernate.service.jdbc.env.spi.StandardQualifiedObjectNameSupportImpl; +import org.hibernate.engine.config.spi.StandardConverters; +import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData; +import org.hibernate.engine.jdbc.env.spi.IdentifierHelper; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.engine.jdbc.env.spi.LobCreatorBuilder; +import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameSupport; +import org.hibernate.engine.jdbc.env.spi.SQLStateType; +import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver; +import org.hibernate.engine.jdbc.env.spi.StandardQualifiedObjectNameSupportImpl; import org.hibernate.service.spi.ServiceRegistryImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentInitiator.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java index b21854e686..eec9ed333e 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/JdbcEnvironmentInitiator.java +++ b/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.service.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.service.spi.ServiceRegistryImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/LobCreatorBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/LobCreatorBuilderImpl.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java index f1437943e1..feb4b5a0be 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/LobCreatorBuilderImpl.java +++ b/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. diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/NormalizingIdentifierHelperImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/NormalizingIdentifierHelperImpl.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java index d5022d5a7f..102d7f5c3f 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/NormalizingIdentifierHelperImpl.java +++ b/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.service.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.engine.jdbc.env.spi.IdentifierHelper; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/TemporarySchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/TemporarySchemaNameResolver.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/TemporarySchemaNameResolver.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/TemporarySchemaNameResolver.java index 20503e6607..287514d47e 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/internal/TemporarySchemaNameResolver.java +++ b/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. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/package-info.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/package-info.java new file mode 100644 index 0000000000..967d0cd7dd --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/package-info.java @@ -0,0 +1 @@ +package org.hibernate.engine.jdbc.env; \ No newline at end of file diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/ExtractedDatabaseMetaData.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/ExtractedDatabaseMetaData.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java index 03418f24b7..12657ced0f 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/ExtractedDatabaseMetaData.java +++ b/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 diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/IdentifierHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/IdentifierHelper.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java index 8a5d8d9202..11a3de36b2 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/IdentifierHelper.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/JdbcEnvironment.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/JdbcEnvironment.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java index b4feb2f5e6..401597507b 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/JdbcEnvironment.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/LobCreatorBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/LobCreatorBuilder.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/LobCreatorBuilder.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/LobCreatorBuilder.java index e874440839..4f4c9df783 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/LobCreatorBuilder.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/QualifiedObjectNameSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/QualifiedObjectNameSupport.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/QualifiedObjectNameSupport.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/QualifiedObjectNameSupport.java index 19abe72845..8bdbb69f90 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/QualifiedObjectNameSupport.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/SQLStateType.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/SQLStateType.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java index 28125ea5bf..2e78dab4ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/SQLStateType.java +++ b/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()} diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/SchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/SchemaNameResolver.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java index 88c1d1ca02..7783143bfe 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/SchemaNameResolver.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/StandardQualifiedObjectNameSupportImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/StandardQualifiedObjectNameSupportImpl.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/StandardQualifiedObjectNameSupportImpl.java rename to hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/StandardQualifiedObjectNameSupportImpl.java index 14d3f18a0f..b8953979e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/spi/StandardQualifiedObjectNameSupportImpl.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java index baf652a1b9..d6a4226146 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java +++ b/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.service.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData; +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; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LogicalConnectionImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LogicalConnectionImpl.java index 791d2f40ba..901b22d1f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LogicalConnectionImpl.java +++ b/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 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java index 8da868ac57..085b95efbf 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java +++ b/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.service.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; /** * Contract for services around JDBC operations. These represent shared resources, aka not varied by session/use. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java index 594bef3e11..8e0f21158a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java +++ b/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; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jdbc/JdbcIsolationDelegate.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jdbc/JdbcIsolationDelegate.java index 748cd87aae..0a882c41bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jdbc/JdbcIsolationDelegate.java +++ b/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 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaIsolationDelegate.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaIsolationDelegate.java index 3d9b7c814e..7f9890cf9b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaIsolationDelegate.java +++ b/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. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionContext.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionContext.java index 1ef7713ae1..2425cf036c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionContext.java +++ b/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. diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java index 77bdddd1b5..20029ac0fb 100755 --- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java +++ b/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; /** diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java index 57228f2f92..57840421bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java +++ b/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; /** diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java index 9f0e1030b0..78ae1c2c39 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java +++ b/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" ); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureCallImpl.java index 84f03f07ad..b477df95b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureCallImpl.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbMappingProcessor.java b/hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbMappingProcessor.java index ee07026dac..233bce9f24 100644 --- a/hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbMappingProcessor.java +++ b/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. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java index 8b6cbbc8cd..03b33cf45a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java +++ b/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 diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Database.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Database.java index 7e5bb2a31d..d0166c2d30 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Database.java +++ b/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. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Exportable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Exportable.java index 864ff61ecc..6ed7d95bd6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Exportable.java +++ b/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 { /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/ObjectName.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/ObjectName.java index aa1afda8d9..8b9feb7593 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/ObjectName.java +++ b/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. */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Table.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Table.java index 60972f1422..1ca1f7af71 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Table.java +++ b/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.service.schema.spi.ColumnInformation; -import org.hibernate.service.schema.spi.TableInformation; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.ColumnInformation; +import org.hibernate.tool.schema.spi.TableInformation; /** * Models the concept of a relational TABLE (or VIEW). diff --git a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java index 1c945077b2..d7b4b4355e 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java +++ b/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.service.schema.internal.SchemaManagementToolInitiator; +import org.hibernate.id.factory.internal.MutableIdentifierGeneratorFactoryInitiator; +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. diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/package-info.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/package-info.java deleted file mode 100644 index b8a05a8da1..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/env/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.hibernate.service.jdbc.env; \ No newline at end of file diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/package-info.java b/hibernate-core/src/main/java/org/hibernate/service/schema/package-info.java deleted file mode 100644 index 0f29914457..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.hibernate.service.schema; \ No newline at end of file diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java index 38c6391dc3..08b90f183d 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java +++ b/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 commands = new ArrayList(); - 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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/ColumnInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnInformationImpl.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/ColumnInformationImpl.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnInformationImpl.java index 5fac2cc358..d158672f1c 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/ColumnInformationImpl.java +++ b/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.service.schema.spi.TableInformation; +import org.hibernate.tool.schema.spi.ColumnInformation; +import org.hibernate.tool.schema.spi.TableInformation; /** * JDBC column metadata diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/DatabaseInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DatabaseInformationImpl.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/DatabaseInformationImpl.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/DatabaseInformationImpl.java index 8e25de603c..3c7b00a311 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/DatabaseInformationImpl.java +++ b/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.service.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.service.schema.spi.ColumnInformation; -import org.hibernate.service.schema.spi.DatabaseInformation; -import org.hibernate.service.schema.spi.SchemaManagementException; -import org.hibernate.service.schema.spi.SequenceInformation; -import org.hibernate.service.schema.spi.TableInformation; +import org.hibernate.engine.jdbc.env.spi.IdentifierHelper; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.ColumnInformation; +import org.hibernate.tool.schema.spi.DatabaseInformation; +import org.hibernate.tool.schema.spi.SchemaManagementException; +import org.hibernate.tool.schema.spi.SequenceInformation; +import org.hibernate.tool.schema.spi.TableInformation; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/ForeignKeyInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ForeignKeyInformationImpl.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/ForeignKeyInformationImpl.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ForeignKeyInformationImpl.java index 5be08e020d..3f8a02c518 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/ForeignKeyInformationImpl.java +++ b/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.service.schema.spi.ForeignKeyInformation; -import org.hibernate.service.schema.spi.SchemaManagementException; +import org.hibernate.tool.schema.spi.ColumnInformation; +import org.hibernate.tool.schema.spi.ForeignKeyInformation; +import org.hibernate.tool.schema.spi.SchemaManagementException; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/HibernateSchemaManagementTool.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/HibernateSchemaManagementTool.java similarity index 83% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/HibernateSchemaManagementTool.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/HibernateSchemaManagementTool.java index 92432ecd13..cb2c430528 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/HibernateSchemaManagementTool.java +++ b/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.service.schema.spi.SchemaDropper; -import org.hibernate.service.schema.spi.SchemaManagementTool; -import org.hibernate.service.schema.spi.SchemaMigrator; -import org.hibernate.service.schema.spi.SchemaValidator; +import org.hibernate.tool.schema.spi.SchemaCreator; +import org.hibernate.tool.schema.spi.SchemaDropper; +import org.hibernate.tool.schema.spi.SchemaManagementTool; +import org.hibernate.tool.schema.spi.SchemaMigrator; +import org.hibernate.tool.schema.spi.SchemaValidator; /** * The standard Hibernate implementation for performing schema management. diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/IndexInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndexInformationImpl.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/IndexInformationImpl.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/IndexInformationImpl.java index 222f3c0d25..61bb31032d 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/IndexInformationImpl.java +++ b/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.service.schema.spi.IndexInformation; -import org.hibernate.service.schema.spi.SchemaManagementException; +import org.hibernate.tool.schema.spi.ColumnInformation; +import org.hibernate.tool.schema.spi.IndexInformation; +import org.hibernate.tool.schema.spi.SchemaManagementException; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaCreatorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaCreatorImpl.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java index c93f5bbe10..c208f184f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaCreatorImpl.java +++ b/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.service.schema.spi.SchemaCreator; -import org.hibernate.service.schema.spi.SchemaManagementException; -import org.hibernate.service.schema.spi.Target; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.SchemaCreator; +import org.hibernate.tool.schema.spi.SchemaManagementException; +import org.hibernate.tool.schema.spi.Target; /** * This is functionally nothing more than the creation script from the older SchemaExport class (plus some diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaDropperImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaDropperImpl.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java index d5e05c706c..117e328265 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaDropperImpl.java +++ b/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.service.schema.spi.SchemaDropper; -import org.hibernate.service.schema.spi.SchemaManagementException; -import org.hibernate.service.schema.spi.Target; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.SchemaDropper; +import org.hibernate.tool.schema.spi.SchemaManagementException; +import org.hibernate.tool.schema.spi.Target; /** * This is functionally nothing more than the creation script from the older SchemaExport class (plus some diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaManagementToolInitiator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaManagementToolInitiator.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaManagementToolInitiator.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaManagementToolInitiator.java index 45cbbb0abb..d3302e8920 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaManagementToolInitiator.java +++ b/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; /** diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaMigratorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaMigratorImpl.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaMigratorImpl.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaMigratorImpl.java index 990a0ac73c..60e8438ea0 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaMigratorImpl.java +++ b/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.service.schema.spi.DatabaseInformation; -import org.hibernate.service.schema.spi.ForeignKeyInformation; -import org.hibernate.service.schema.spi.SchemaManagementException; -import org.hibernate.service.schema.spi.SchemaMigrator; -import org.hibernate.service.schema.spi.SequenceInformation; -import org.hibernate.service.schema.spi.TableInformation; -import org.hibernate.service.schema.spi.Target; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.DatabaseInformation; +import org.hibernate.tool.schema.spi.ForeignKeyInformation; +import org.hibernate.tool.schema.spi.SchemaManagementException; +import org.hibernate.tool.schema.spi.SchemaMigrator; +import org.hibernate.tool.schema.spi.SequenceInformation; +import org.hibernate.tool.schema.spi.TableInformation; +import org.hibernate.tool.schema.spi.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaValidatorImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaValidatorImpl.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaValidatorImpl.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaValidatorImpl.java index 40a37c2426..03f50367ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SchemaValidatorImpl.java +++ b/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.service.schema.spi.DatabaseInformation; -import org.hibernate.service.schema.spi.SchemaManagementException; -import org.hibernate.service.schema.spi.SchemaValidator; -import org.hibernate.service.schema.spi.SequenceInformation; -import org.hibernate.service.schema.spi.TableInformation; +import org.hibernate.tool.schema.spi.ColumnInformation; +import org.hibernate.tool.schema.spi.DatabaseInformation; +import org.hibernate.tool.schema.spi.SchemaManagementException; +import org.hibernate.tool.schema.spi.SchemaValidator; +import org.hibernate.tool.schema.spi.SequenceInformation; +import org.hibernate.tool.schema.spi.TableInformation; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SequenceInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SequenceInformationImpl.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/SequenceInformationImpl.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SequenceInformationImpl.java index 49d9c3f5d6..bd5713af34 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/SequenceInformationImpl.java +++ b/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. diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java index 9b88a9c020..808aec5b4b 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardAuxiliaryDatabaseObjectExporter.java +++ b/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.service.schema.spi.Exporter; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.Exporter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardForeignKeyExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java similarity index 96% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardForeignKeyExporter.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java index b9f27ed5fb..9dda0fdd7d 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardForeignKeyExporter.java +++ b/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.service.schema.spi.Exporter; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.Exporter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardIndexExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardIndexExporter.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardIndexExporter.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardIndexExporter.java index 7b8bca01c5..e5ab92aa8c 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardIndexExporter.java +++ b/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.service.schema.spi.Exporter; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.Exporter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardSequenceExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardSequenceExporter.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardSequenceExporter.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardSequenceExporter.java index ea6c51df6c..24a4b894ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardSequenceExporter.java +++ b/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.service.schema.spi.Exporter; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.Exporter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardTableExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardTableExporter.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java index 3aac2244bd..c62d8e3dce 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardTableExporter.java +++ b/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.service.schema.spi.Exporter; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.Exporter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardUniqueKeyExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUniqueKeyExporter.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardUniqueKeyExporter.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUniqueKeyExporter.java index e5a2a628c8..74cb6bfdc1 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/StandardUniqueKeyExporter.java +++ b/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.service.schema.spi.Exporter; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.Exporter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/TableInformationImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TableInformationImpl.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/TableInformationImpl.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TableInformationImpl.java index da75c5406f..b8c3eb6091 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/TableInformationImpl.java +++ b/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.service.schema.spi.ForeignKeyInformation; -import org.hibernate.service.schema.spi.IndexInformation; -import org.hibernate.service.schema.spi.TableInformation; +import org.hibernate.tool.schema.spi.ColumnInformation; +import org.hibernate.tool.schema.spi.ForeignKeyInformation; +import org.hibernate.tool.schema.spi.IndexInformation; +import org.hibernate.tool.schema.spi.TableInformation; /** * Provides access to information about existing schema objects (tables, sequences etc) of existing database. diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/TemporarySequenceInformationExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TemporarySequenceInformationExtractor.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/service/schema/internal/TemporarySequenceInformationExtractor.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TemporarySequenceInformationExtractor.java index b533c30cf7..0d4f638df1 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/internal/TemporarySequenceInformationExtractor.java +++ b/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.service.schema.spi.SequenceInformation; -import org.hibernate.service.schema.spi.SequenceInformationExtractor; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.spi.SequenceInformation; +import org.hibernate.tool.schema.spi.SequenceInformationExtractor; /** * Temporary implementation that works for H2. diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/package-info.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/package-info.java new file mode 100644 index 0000000000..12d72e9f2c --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/package-info.java @@ -0,0 +1 @@ +package org.hibernate.tool.schema; \ No newline at end of file diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/ColumnInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ColumnInformation.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/ColumnInformation.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ColumnInformation.java index 62f4a42952..df450dd5fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/ColumnInformation.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/DatabaseInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DatabaseInformation.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/DatabaseInformation.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/DatabaseInformation.java index 57c2133bf5..9ec824556c 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/DatabaseInformation.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/Exporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Exporter.java similarity index 94% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/Exporter.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Exporter.java index 9a9cc63d28..bf0fe6d0cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/Exporter.java +++ b/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 diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/ForeignKeyInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ForeignKeyInformation.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/ForeignKeyInformation.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ForeignKeyInformation.java index a2dee99d67..706269fb1c 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/ForeignKeyInformation.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/IndexInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/IndexInformation.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/IndexInformation.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/IndexInformation.java index 39752a04ab..19518e6a6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/IndexInformation.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaCreator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaCreator.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaCreator.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaCreator.java index e12bbd89cf..4ee9713996 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaCreator.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaDropper.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaDropper.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaDropper.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaDropper.java index 0cd27882cc..1b5305fb36 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaDropper.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaManagementException.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementException.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaManagementException.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementException.java index 80f95159aa..3798b13d84 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaManagementException.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaManagementTool.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementTool.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaManagementTool.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementTool.java index 2e59ec856d..2bda8df226 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaManagementTool.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaMigrator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaMigrator.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaMigrator.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaMigrator.java index 319b1d1938..34c3988896 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaMigrator.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaValidator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaValidator.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaValidator.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaValidator.java index 7ec5c30a49..d86de8b9dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SchemaValidator.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SequenceInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SequenceInformation.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/SequenceInformation.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SequenceInformation.java index 378b536a34..258fa32368 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SequenceInformation.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SequenceInformationExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SequenceInformationExtractor.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/SequenceInformationExtractor.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SequenceInformationExtractor.java index 65af8539c1..fc33423f2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/SequenceInformationExtractor.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/TableInformation.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TableInformation.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/TableInformation.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TableInformation.java index ea879dc9b6..4ec2c806dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/TableInformation.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/Target.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Target.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/service/schema/spi/Target.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Target.java index 2f556b32f4..b351653c90 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/schema/spi/Target.java +++ b/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 diff --git a/hibernate-core/src/test/java/org/hibernate/jdbc/LobCreatorTest.java b/hibernate-core/src/test/java/org/hibernate/jdbc/LobCreatorTest.java index f0c1202b48..4e9fc9bf0a 100644 --- a/hibernate-core/src/test/java/org/hibernate/jdbc/LobCreatorTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java index 08a7e1d1a5..6cfe367c74 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java +++ b/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 diff --git a/hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java b/hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java index 8b153b6b1b..ff52f2ddff 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java +++ b/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.service.jdbc.env.internal.LobCreatorBuilderImpl; -import org.hibernate.service.jdbc.env.spi.ExtractedDatabaseMetaData; -import org.hibernate.service.jdbc.env.spi.IdentifierHelper; -import org.hibernate.service.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.service.jdbc.env.spi.LobCreatorBuilder; -import org.hibernate.service.jdbc.env.spi.QualifiedObjectNameSupport; +import org.hibernate.engine.jdbc.env.internal.ExtractedDatabaseMetaDataImpl; +import org.hibernate.engine.jdbc.env.internal.LobCreatorBuilderImpl; +import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData; +import org.hibernate.engine.jdbc.env.spi.IdentifierHelper; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.engine.jdbc.env.spi.LobCreatorBuilder; +import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameSupport; import org.hibernate.service.spi.Stoppable; import org.hibernate.testing.env.ConnectionProviderBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java b/hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java index 68895887ca..7debaaf29a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java +++ b/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 diff --git a/hibernate-core/src/test/java/org/hibernate/test/common/TransactionContextImpl.java b/hibernate-core/src/test/java/org/hibernate/test/common/TransactionContextImpl.java index eff0c865b2..be004ab280 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/common/TransactionContextImpl.java +++ b/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 diff --git a/hibernate-core/src/test/java/org/hibernate/test/engine/jdbc/env/StandardSchemaCatalogSupportImplTest.java b/hibernate-core/src/test/java/org/hibernate/test/engine/jdbc/env/StandardSchemaCatalogSupportImplTest.java index 7335e885c2..1883bbc05f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/engine/jdbc/env/StandardSchemaCatalogSupportImplTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/test/service/schema/internal/ExistingDatabaseMetaDataImplTest.java b/hibernate-core/src/test/java/org/hibernate/test/service/schema/internal/ExistingDatabaseMetaDataImplTest.java index d4586918ff..ddea56cef4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/service/schema/internal/ExistingDatabaseMetaDataImplTest.java +++ b/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.service.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.service.schema.internal.DatabaseInformationImpl; -import org.hibernate.service.schema.spi.DatabaseInformation; +import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentImpl; +import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; +import org.hibernate.tool.schema.internal.DatabaseInformationImpl; +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? } diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/EhCacheRegionFactory.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/EhCacheRegionFactory.java index 9a9d1c1615..4dd584f9cd 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/EhCacheRegionFactory.java +++ b/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. diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/SingletonEhCacheRegionFactory.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/SingletonEhCacheRegionFactory.java index b2318d2a84..75b65b4392 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/SingletonEhCacheRegionFactory.java +++ b/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. diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/spi/JpaUnifiedSettingsBuilder.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/spi/JpaUnifiedSettingsBuilder.java index c362742d99..a05491bd66 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/spi/JpaUnifiedSettingsBuilder.java +++ b/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; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java index d751130cd1..1082c05335 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java +++ b/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; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java index a6b37dc602..e0b4388543 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java +++ b/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; /** diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java index 832ac44ef5..8e0d32f1de 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java +++ b/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 Infinispan-backed cache diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java index 9eb16773fb..a42546bd54 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java +++ b/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 Infinispan-backed cache diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java index 56b7a70b94..8c5358fe98 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java @@ -36,14 +36,12 @@ import org.hibernate.cache.spi.CollectionRegion; import org.hibernate.cache.spi.EntityRegion; import org.hibernate.cache.spi.NaturalIdRegion; import org.hibernate.cache.spi.QueryResultsRegion; -import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.spi.TimestampsRegion; import org.hibernate.cache.spi.access.AccessType; 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; import org.hibernate.service.spi.InjectService; -import org.hibernate.service.spi.ServiceRegistryAwareService; import org.hibernate.service.spi.ServiceRegistryImplementor; /**