Skip to content
Browse files

HHH-7556 - Clean up packages

  • Loading branch information...
1 parent d52a20a commit 4ad49a02c9058831e2652e84de722220335b2780 @sebersole sebersole committed Aug 28, 2012
Showing with 1,057 additions and 860 deletions.
  1. +1 −1 changelog.txt
  2. +8 −8 documentation/src/main/docbook/devguide/en-US/Database_Access.xml
  3. +5 −5 documentation/src/main/docbook/devguide/en-US/chapters/multitenancy/Multi_Tenancy.xml
  4. +51 −51 documentation/src/main/docbook/devguide/en-US/chapters/services/Services.xml
  5. +2 −2 documentation/src/main/docbook/devguide/en-US/chapters/transactions/Transactions.xml
  6. +4 −3 ...te-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java
  7. +1 −1 hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java
  8. +1 −1 hibernate-core/src/main/java/org/hibernate/SessionFactory.java
  9. +35 −0 hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistry.java
  10. +152 −0 hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java
  11. +4 −2 .../hibernate/{service/spi/BasicServiceInitiator.java → boot/registry/StandardServiceInitiator.java}
  12. +224 −0 hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
  13. +3 −3 ...in/java/org/hibernate/{service → boot/registry}/classloading/internal/ClassLoaderServiceImpl.java
  14. +1 −1 ...re/src/main/java/org/hibernate/{service → boot/registry}/classloading/spi/ClassLoaderService.java
  15. +1 −1 ...src/main/java/org/hibernate/{service → boot/registry}/classloading/spi/ClassLoadingException.java
  16. +12 −7 .../src/main/java/org/hibernate/{service → boot/registry}/internal/BootstrapServiceRegistryImpl.java
  17. +7 −5 ...e/src/main/java/org/hibernate/{service → boot/registry}/internal/StandardServiceRegistryImpl.java
  18. +4 −4 .../main/java/org/hibernate/{service → boot/registry}/selector/internal/StrategySelectorBuilder.java
  19. +5 −5 ...src/main/java/org/hibernate/{service → boot/registry}/selector/internal/StrategySelectorImpl.java
  20. +1 −0 hibernate-core/src/main/java/org/hibernate/boot/registry/selector/package-info.java
  21. +1 −1 ...rc/main/java/org/hibernate/{service → boot/registry}/selector/spi/StrategySelectionException.java
  22. +1 −1 ...ate-core/src/main/java/org/hibernate/{service → boot/registry}/selector/spi/StrategySelector.java
  23. +3 −3 hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java
  24. +11 −11 hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
  25. +4 −4 hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
  26. +1 −1 hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
  27. +1 −1 hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
  28. +4 −4 hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
  29. +1 −1 hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java
  30. +1 −1 hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java
  31. +4 −4 ...core/src/main/java/org/hibernate/{service → engine}/config/internal/ConfigurationServiceImpl.java
  32. +4 −4 ...src/main/java/org/hibernate/{service → engine}/config/internal/ConfigurationServiceInitiator.java
  33. +1 −1 hibernate-core/src/main/java/org/hibernate/{service → engine}/config/spi/ConfigurationService.java
  34. +3 −3 hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java
  35. +5 −5 .../java/org/hibernate/{service → engine}/jdbc/connections/internal/ConnectionProviderInitiator.java
  36. +4 −4 .../org/hibernate/{service → engine}/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
  37. +4 −4 ...g/hibernate/{service → engine}/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
  38. +8 −8 ...ibernate/{service → engine}/jdbc/connections/internal/MultiTenantConnectionProviderInitiator.java
  39. +2 −2 ...rg/hibernate/{service → engine}/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
  40. +1 −1 ...vice → engine}/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
  41. +1 −1 .../org/hibernate/{service → engine}/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
  42. +1 −1 ...-core/src/main/java/org/hibernate/{service → engine}/jdbc/connections/spi/ConnectionProvider.java
  43. +3 −3 ...ate/{service → engine}/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java
  44. +1 −1 ...ain/java/org/hibernate/{service → engine}/jdbc/connections/spi/MultiTenantConnectionProvider.java
  45. +4 −4 ...rc/main/java/org/hibernate/{service → engine}/jdbc/cursor/internal/RefCursorSupportInitiator.java
  46. +2 −2 ...src/main/java/org/hibernate/{service → engine}/jdbc/cursor/internal/StandardRefCursorSupport.java
  47. +1 −1 hibernate-core/src/main/java/org/hibernate/{service → engine}/jdbc/cursor/spi/RefCursorSupport.java
  48. +2 −2 ...src/main/java/org/hibernate/{service → engine}/jdbc/dialect/internal/AbstractDialectResolver.java
  49. +1 −1 ...re/src/main/java/org/hibernate/{service → engine}/jdbc/dialect/internal/BasicDialectResolver.java
  50. +5 −5 ...core/src/main/java/org/hibernate/{service → engine}/jdbc/dialect/internal/DialectFactoryImpl.java
  51. +4 −4 ...src/main/java/org/hibernate/{service → engine}/jdbc/dialect/internal/DialectFactoryInitiator.java
  52. +5 −5 ...rc/main/java/org/hibernate/{service → engine}/jdbc/dialect/internal/DialectResolverInitiator.java
  53. +2 −2 ...core/src/main/java/org/hibernate/{service → engine}/jdbc/dialect/internal/DialectResolverSet.java
  54. +1 −1 ...src/main/java/org/hibernate/{service → engine}/jdbc/dialect/internal/StandardDialectResolver.java
  55. +1 −1 hibernate-core/src/main/java/org/hibernate/{service → engine}/jdbc/dialect/spi/DialectFactory.java
  56. +1 −1 hibernate-core/src/main/java/org/hibernate/{service → engine}/jdbc/dialect/spi/DialectResolver.java
  57. +4 −4 hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java
  58. +2 −2 hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java
  59. +2 −2 hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcConnectionAccess.java
  60. +1 −1 hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java
  61. +1 −1 hibernate-core/src/main/java/org/hibernate/{service → engine}/jndi/JndiException.java
  62. +1 −1 hibernate-core/src/main/java/org/hibernate/{service → engine}/jndi/JndiNameException.java
  63. +4 −4 hibernate-core/src/main/java/org/hibernate/{service → engine}/jndi/internal/JndiServiceImpl.java
  64. +4 −4 ...rnate-core/src/main/java/org/hibernate/{service → engine}/jndi/internal/JndiServiceInitiator.java
  65. +1 −1 hibernate-core/src/main/java/org/hibernate/{service → engine}/jndi/spi/JndiService.java
  66. +1 −1 hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
  67. +1 −1 ...nate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
  68. +3 −3 ...ate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionFactoryInitiator.java
  69. +1 −1 ...rnate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaTransactionFactory.java
  70. +3 −3 .../java/org/hibernate/{service → engine/transaction}/jta/platform/internal/AbstractJtaPlatform.java
  71. +3 −3 .../java/org/hibernate/{service → engine/transaction}/jta/platform/internal/BitronixJtaPlatform.java
  72. +1 −1 ...nate/{service → engine/transaction}/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java
  73. +2 −2 ...org/hibernate/{service → engine/transaction}/jta/platform/internal/JBossAppServerJtaPlatform.java
  74. +3 −3 ...rg/hibernate/{service → engine/transaction}/jta/platform/internal/JBossStandAloneJtaPlatform.java
  75. +3 −3 ...main/java/org/hibernate/{service → engine/transaction}/jta/platform/internal/JOTMJtaPlatform.java
  76. +2 −2 ...ain/java/org/hibernate/{service → engine/transaction}/jta/platform/internal/JOnASJtaPlatform.java
  77. +2 −2 ...ain/java/org/hibernate/{service → engine/transaction}/jta/platform/internal/JRun4JtaPlatform.java
  78. +8 −8 ...java/org/hibernate/{service → engine/transaction}/jta/platform/internal/JtaPlatformInitiator.java
  79. +1 −1 ...rg/hibernate/{service → engine/transaction}/jta/platform/internal/JtaSynchronizationStrategy.java
  80. +2 −2 ...c/main/java/org/hibernate/{service → engine/transaction}/jta/platform/internal/NoJtaPlatform.java
  81. +2 −2 ...main/java/org/hibernate/{service → engine/transaction}/jta/platform/internal/OC4JJtaPlatform.java
  82. +2 −2 ...ain/java/org/hibernate/{service → engine/transaction}/jta/platform/internal/OrionJtaPlatform.java
  83. +2 −2 ...ain/java/org/hibernate/{service → engine/transaction}/jta/platform/internal/ResinJtaPlatform.java
  84. +2 −2 ...in/java/org/hibernate/{service → engine/transaction}/jta/platform/internal/SunOneJtaPlatform.java
  85. +1 −1 ...hibernate/{service → engine/transaction}/jta/platform/internal/SynchronizationRegistryAccess.java
  86. +1 −1 ...ngine/transaction}/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java
  87. +1 −1 .../org/hibernate/{service → engine/transaction}/jta/platform/internal/TransactionManagerAccess.java
  88. +2 −2 ...e → engine/transaction}/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java
  89. +2 −2 ...ibernate/{service → engine/transaction}/jta/platform/internal/TransactionManagerLookupBridge.java
  90. +1 −1 .../hibernate/{service → engine/transaction}/jta/platform/internal/WebSphereExtendedJtaPlatform.java
  91. +2 −2 ...java/org/hibernate/{service → engine/transaction}/jta/platform/internal/WebSphereJtaPlatform.java
  92. +2 −2 .../java/org/hibernate/{service → engine/transaction}/jta/platform/internal/WeblogicJtaPlatform.java
  93. +1 −1 ...core/src/main/java/org/hibernate/{service → engine/transaction}/jta/platform/spi/JtaPlatform.java
  94. +1 −1 ...main/java/org/hibernate/{service → engine/transaction}/jta/platform/spi/JtaPlatformException.java
  95. +2 −2 hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/AbstractTransactionImpl.java
  96. +1 −1 hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionEnvironment.java
  97. +2 −2 ...e/src/main/java/org/hibernate/id/factory/internal/MutableIdentifierGeneratorFactoryInitiator.java
  98. +1 −1 hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java
  99. +2 −2 hibernate-core/src/main/java/org/hibernate/integrator/spi/ServiceContributingIntegrator.java
  100. +2 −2 hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
  101. +3 −3 hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
  102. +7 −7 hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
  103. +3 −3 hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java
  104. +1 −1 hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureCallImpl.java
  105. +1 −4 hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureOutputsImpl.java
  106. +1 −1 hibernate-core/src/main/java/org/hibernate/internal/TransactionEnvironmentImpl.java
  107. +1 −1 hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java
  108. +1 −1 hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiHelper.java
  109. +2 −2 hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java
  110. +3 −3 hibernate-core/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java
  111. +1 −1 hibernate-core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java
  112. +2 −2 hibernate-core/src/main/java/org/hibernate/{service → }/jmx/internal/DisabledJmxServiceImpl.java
  113. +2 −2 hibernate-core/src/main/java/org/hibernate/{service → }/jmx/internal/JmxServiceImpl.java
  114. +4 −4 hibernate-core/src/main/java/org/hibernate/{service → }/jmx/internal/JmxServiceInitiator.java
  115. +0 −14 hibernate-core/src/main/java/org/hibernate/jmx/package.html
  116. +1 −1 hibernate-core/src/main/java/org/hibernate/{service → }/jmx/spi/JmxService.java
  117. +1 −1 hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
  118. +1 −1 hibernate-core/src/main/java/org/hibernate/metamodel/domain/JavaType.java
  119. +1 −1 hibernate-core/src/main/java/org/hibernate/metamodel/domain/Type.java
  120. +1 −1 ...e-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationBindingContextImpl.java
  121. +1 −1 ...c/main/java/org/hibernate/metamodel/source/annotations/AnnotationMetadataSourceProcessorImpl.java
  122. +1 −1 hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/JandexHelper.java
  123. +1 −1 hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IndexBuilder.java
  124. +1 −1 hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MockHelper.java
  125. +2 −2 hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/Helper.java
  126. +2 −2 hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java
  127. +1 −1 ...rnate-core/src/main/java/org/hibernate/metamodel/source/internal/IdentifierGeneratorResolver.java
  128. +1 −1 hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java
  129. +1 −1 hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java
  130. +1 −1 hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
  131. +3 −3 hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterClassResolverInitiator.java
  132. +3 −3 hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryInitiator.java
  133. +4 −6 hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistry.java
  134. +18 −98 hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistryBuilder.java
  135. +2 −1 hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java
  136. +2 −2 hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java
  137. +26 −158 hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
  138. +13 −13 hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
  139. +2 −2 hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
  140. +1 −1 hibernate-core/src/main/java/org/hibernate/service/internal/JaxbProcessor.java
  141. +1 −1 ...e-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java
  142. +2 −2 ...e/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryInitiator.java
  143. +0 −1 hibernate-core/src/main/java/org/hibernate/service/selector/package-info.java
  144. +2 −2 hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
  145. +1 −1 hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java
  146. +3 −3 hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractorInitiator.java
  147. +4 −4 hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java
  148. +5 −5 hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
  149. +3 −3 hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
  150. +3 −3 hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
  151. +1 −1 ...ate-core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java
  152. +1 −1 hibernate-core/src/test/java/org/hibernate/connection/PropertiesTest.java
  153. +2 −2 hibernate-core/src/test/java/org/hibernate/dialect/TestingDialects.java
  154. +6 −6 hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java
  155. +3 −3 hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectResolverTest.java
  156. +3 −3 hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java
  157. +3 −3 hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicCollectionBindingTests.java
  158. +1 −1 hibernate-core/src/test/java/org/hibernate/metamodel/binding/SimpleValueBindingTests.java
  159. +3 −2 ...rc/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java
  160. +2 −2 ...core/src/test/java/org/hibernate/metamodel/source/annotations/entity/IdentifierGeneratorTest.java
  161. +2 −2 hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/MapsIdTest.java
  162. +4 −4 ...-core/src/test/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinderTest.java
  163. +4 −4 hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/QueryBinderTest.java
  164. +3 −3 ...re/src/test/java/org/hibernate/metamodel/source/annotations/util/BaseAnnotationIndexTestCase.java
  165. +4 −4 hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/JandexHelperTest.java
  166. +5 −4 hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java
  167. +1 −1 ...-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMockerTest.java
  168. +1 −1 hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/XmlHelper.java
  169. +8 −7 hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java
  170. +3 −2 ...ate-core/src/test/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImplTest.java
  171. +5 −5 ...rnate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java
  172. +10 −9 hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java
  173. +1 −1 hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java
  174. +1 −1 hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java
  175. +1 −1 hibernate-core/src/test/java/org/hibernate/test/common/TransactionEnvironmentImpl.java
  176. +1 −1 hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
  177. +2 −2 hibernate-core/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java
  178. +1 −1 hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java
  179. +1 −1 hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java
  180. +3 −2 hibernate-core/src/test/java/org/hibernate/test/fileimport/CommandExtractorServiceTest.java
  181. +1 −2 hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java
  182. +1 −1 hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java
  183. +3 −3 hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BatchingTest.java
  184. +1 −1 hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java
  185. +1 −1 ...ate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
  186. +1 −1 hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java
  187. +4 −4 hibernate-core/src/test/java/org/hibernate/test/multitenancy/ConfigurationValidationTest.java
  188. +2 −2 hibernate-core/src/test/java/org/hibernate/test/multitenancy/TestingConnectionProvider.java
  189. +6 −6 hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java
  190. +1 −1 hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
  191. +9 −9 hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java
  192. +3 −3 hibernate-core/src/test/java/org/hibernate/test/transaction/jdbc/TestExpectedUsage.java
  193. +4 −4 hibernate-core/src/test/java/org/hibernate/test/transaction/jta/BasicDrivingTest.java
  194. +4 −4 hibernate-core/src/test/java/org/hibernate/test/transaction/jta/ManagedDrivingTest.java
  195. +1 −1 hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java
  196. +8 −8 ...-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
  197. +2 −2 hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java
  198. +2 −3 ...rnate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
  199. +1 −2 hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
  200. +1 −1 hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
  201. +1 −1 ...rnate-entitymanager/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java
  202. +1 −1 hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java
  203. +1 −1 hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java
  204. +1 −1 hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java
  205. +2 −2 hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java
  206. +1 −1 ...infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java
  207. +1 −1 ...pan/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java
  208. +6 −5 ...finispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java
  209. +2 −2 ...infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
  210. +3 −3 hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
  211. +2 −2 ...-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java
  212. +2 −2 ...e-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java
  213. +2 −2 ...pan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java
  214. +1 −1 ...t/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java
  215. +1 −1 ...src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java
  216. +1 −1 ...nispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java
  217. +4 −3 ...e-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java
  218. +4 −3 ...pan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
  219. +1 −1 ...nfinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
  220. +1 −1 hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JtaPlatformImpl.java
  221. +1 −1 hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java
  222. +1 −1 ...rnate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeJtaPlatform.java
  223. +1 −1 ...xool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java
  224. +3 −2 hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
  225. +1 −1 hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
  226. +3 −4 hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
  227. +4 −4 hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
  228. +7 −7 hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
View
2 changelog.txt
@@ -256,7 +256,7 @@ https://hibernate.onjira.com/browse/HHH/fixforversion/11223
** Task
* [HHH-6082] - Incorporate EntityManager documentation into main dev guide
* [HHH-6336] - Add TenantIdentifierResolver
- * [HHH-6656] - Document org.hibernate.service.classloading.spi.ClassLoaderService
+ * [HHH-6656] - Document org.hibernate.boot.registry.classloading.spi.ClassLoaderService
* [HHH-6966] - Re apply HHH-6782
* [HHH-6985] - Change up tests for PostgreSQL LockMode issues
* [HHH-7011] - Document multi-tenancy
View
16 documentation/src/main/docbook/devguide/en-US/Database_Access.xml
@@ -32,9 +32,9 @@
<para>
Hibernate obtains JDBC connections as needed though the
- <interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename> interface
+ <interfacename>ConnectionProvider</interfacename> interface
which is a service contract. Applications may also supply their own
- <interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename> implementation
+ <interfacename>ConnectionProvider</interfacename> implementation
to define a custom approach for supplying connections to Hibernate (from a different connection pool
implementation, for example).
</para>
@@ -232,7 +232,7 @@
</para>
<para>
You can define your own plugin strategy for obtaining JDBC connections by implementing the interface
- <interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename> and specifying your custom
+ <interfacename>ConnectionProvider</interfacename> and specifying your custom
implementation with the <property>hibernate.connection.provider_class</property> property.
</para>
</section>
@@ -386,22 +386,22 @@
<section>
<title>Dialect resolution</title>
<para>
- Assuming a <interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename> has been
+ Assuming a <interfacename>ConnectionProvider</interfacename> has been
set up, Hibernate will attempt to automatically determine the Dialect to use based on the
<interfacename>java.sql.DatabaseMetaData</interfacename> reported by a
<interfacename>java.sql.Connection</interfacename> obtained from that
- <interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename>.
+ <interfacename>ConnectionProvider</interfacename>.
</para>
<para>
This functionality is provided by a series of
- <interfacename>org.hibernate.service.jdbc.dialect.spi.DialectResolver</interfacename> instances registered
+ <interfacename>org.hibernate.engine.jdbc.dialect.spi.DialectResolver</interfacename> instances registered
with Hibernate internally. Hibernate comes with a standard set of recognitions. If your application
requires extra Dialect resolution capabilities, it would simply register a custom implementation
- of <interfacename>org.hibernate.service.jdbc.dialect.spi.DialectResolver</interfacename> as follows:
+ of <interfacename>org.hibernate.engine.jdbc.dialect.spi.DialectResolver</interfacename> as follows:
</para>
<!-- document an example using the service registry -->
<para>
- Registered <interfacename>org.hibernate.service.jdbc.dialect.spi.DialectResolver</interfacename> are
+ Registered <interfacename>org.hibernate.engine.jdbc.dialect.spi.DialectResolver</interfacename> are
<emphasis>prepended</emphasis> to an internal list of resolvers, so they take precedence
before any already registered resolvers including the standard one.
</para>
View
10 documentation/src/main/docbook/devguide/en-US/chapters/multitenancy/Multi_Tenancy.xml
@@ -149,7 +149,7 @@
<para>
Correlates to the separate schema approach. It is an error to attempt to open a session without
a tenant identifier using this strategy. Additionally, a
- <interfacename>org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider</interfacename>
+ <interfacename>MultiTenantConnectionProvider</interfacename>
must be specified.
</para>
</listitem>
@@ -160,7 +160,7 @@
<para>
Correlates to the separate database approach. It is an error to attempt to open a session without
a tenant identifier using this strategy. Additionally, a
- <interfacename>org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider</interfacename>
+ <interfacename>MultiTenantConnectionProvider</interfacename>
must be specified.
</para>
</listitem>
@@ -182,7 +182,7 @@
<para>
When using either the DATABASE or SCHEMA approach, Hibernate needs to be able to obtain Connections
in a tenant specific manner. That is the role of the
- <interfacename>org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider</interfacename>
+ <interfacename>MultiTenantConnectionProvider</interfacename>
contract. Application developers will need to provide an implementation of this
contract. Most of its methods are extremely self-explanatory. The only ones which might not be are
<methodname>getAnyConnection</methodname> and <methodname>releaseAnyConnection</methodname>. It is
@@ -205,15 +205,15 @@
</listitem>
<listitem>
<para>
- Passed directly to the <classname>org.hibernate.service.ServiceRegistryBuilder</classname>.
+ Passed directly to the <classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname>.
</para>
</listitem>
<listitem>
<para>
If none of the above options match, but the settings do specify a
<property>hibernate.connection.datasource</property> value, Hibernate will assume it should
use the specific
- <classname>org.hibernate.service.jdbc.connections.spi.DataSourceBasedMultiTenantConnectionProviderImpl</classname>
+ <classname>DataSourceBasedMultiTenantConnectionProviderImpl</classname>
implementation which works on a number of pretty reasonable assumptions when running inside of
an app server and using one <interfacename>javax.sql.DataSource</interfacename> per tenant.
See its javadocs for more details.
View
102 documentation/src/main/docbook/devguide/en-US/chapters/services/Services.xml
@@ -81,7 +81,7 @@
same registry as well as any parent registries.
</para>
<para>
- Use <classname>org.hibernate.service.ServiceRegistryBuilder</classname> to build a
+ Use <classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname> to build a
<interfacename>org.hibernate.service.ServiceRegistry</interfacename> instance.
</para>
</section>
@@ -121,7 +121,7 @@
</section>
<section xml:id="services-ConfigurationService">
- <title><interfacename>org.hibernate.service.config.spi.ConfigurationService</interfacename></title>
+ <title><interfacename>org.hibernate.engine.config.spi.ConfigurationService</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@@ -137,23 +137,23 @@
<term>Initiator</term>
<listitem>
<para>
- <classname>org.hibernate.service.config.internal.ConfigurationServiceInitiator</classname>
+ <classname>org.hibernate.engine.config.internal.ConfigurationServiceInitiator</classname>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Implementations</term>
<listitem>
<para>
- <classname>org.hibernate.service.config.internal.ConfigurationServiceImpl</classname>
+ <classname>org.hibernate.engine.config.internal.ConfigurationServiceImpl</classname>
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
<section xml:id="services-ConnectionProvider">
- <title><interfacename>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</interfacename></title>
+ <title><interfacename>ConnectionProvider</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@@ -168,7 +168,7 @@
<term>Initiator</term>
<listitem>
<para>
- <classname>org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator</classname>
+ <classname>ConnectionProviderInitiator</classname>
</para>
</listitem>
</varlistentry>
@@ -184,14 +184,14 @@
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl</classname> -
+ <classname>DatasourceConnectionProviderImpl</classname> -
provides connection managed delegated to a
<interfacename>javax.sql.DataSource</interfacename>
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jdbc.connections.internal.DriverManagerConnectionProviderImpl</classname> -
+ <classname>DriverManagerConnectionProviderImpl</classname> -
provides rudimentary connection pooling based on simple custom pool. Note intended
production use!
</para>
@@ -204,7 +204,7 @@
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jdbc.connections.internal.UserSuppliedConnectionProviderImpl</classname> -
+ <classname>UserSuppliedConnectionProviderImpl</classname> -
Provides no connection support. Indicates the user will supply connections to Hibernate directly.
Not recommended for use.
</para>
@@ -216,7 +216,7 @@
</section>
<section xml:id="services-DialectFactory">
- <title><interfacename>org.hibernate.service.jdbc.dialect.spi.DialectFactory</interfacename></title>
+ <title><interfacename>org.hibernate.engine.jdbc.dialect.spi.DialectFactory</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@@ -233,23 +233,23 @@
<term>Initiator</term>
<listitem>
<para>
- <classname>org.hibernate.service.jdbc.dialect.internal.DialectFactoryInitiator</classname>
+ <classname>org.hibernate.engine.jdbc.dialect.internal.DialectFactoryInitiator</classname>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Implementations</term>
<listitem>
<para>
- <classname>org.hibernate.service.jdbc.dialect.internal.DialectFactoryImpl</classname>
+ <classname>org.hibernate.engine.jdbc.dialect.internal.DialectFactoryImpl</classname>
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
<section xml:id="services-DialectResolver">
- <title><interfacename>org.hibernate.service.jdbc.dialect.spi.DialectResolver</interfacename></title>
+ <title><interfacename>org.hibernate.engine.jdbc.dialect.spi.DialectResolver</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@@ -261,8 +261,8 @@
<para>
The standard resolver implementation acts as a chain, delegating to a series of individual
resolvers. The standard Hibernate resolution behavior is contained in
- <classname>org.hibernate.service.jdbc.dialect.internal.StandardDialectResolver</classname>.
- <classname>org.hibernate.service.jdbc.dialect.internal.DialectResolverInitiator</classname>
+ <classname>org.hibernate.engine.jdbc.dialect.internal.StandardDialectResolver</classname>.
+ <classname>org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator</classname>
also consults with the <property>hibernate.dialect_resolvers</property> setting for any
custom resolvers.
</para>
@@ -272,15 +272,15 @@
<term>Initiator</term>
<listitem>
<para>
- <classname>org.hibernate.service.jdbc.dialect.internal.DialectResolverInitiator</classname>
+ <classname>org.hibernate.engine.jdbc.dialect.internal.DialectResolverInitiator</classname>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Implementations</term>
<listitem>
<para>
- <classname>org.hibernate.service.jdbc.dialect.internal.DialectResolverSet</classname>
+ <classname>org.hibernate.engine.jdbc.dialect.internal.DialectResolverSet</classname>
</para>
</listitem>
</varlistentry>
@@ -319,7 +319,7 @@
</section>
<section xml:id="services-JmxService">
- <title><interfacename>org.hibernate.service.jmx.spi.JmxService</interfacename></title>
+ <title><interfacename>org.hibernate.jmx.spi.JmxService</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@@ -333,7 +333,7 @@
<term>Initiator</term>
<listitem>
<para>
- <classname>org.hibernate.service.jmx.internal.JmxServiceInitiator</classname>
+ <classname>org.hibernate.jmx.internal.JmxServiceInitiator</classname>
</para>
</listitem>
</varlistentry>
@@ -343,13 +343,13 @@
<itemizedlist>
<listitem>
<para>
- <classname>org.hibernate.service.jmx.internal.DisabledJmxServiceImpl</classname> -
+ <classname>org.hibernate.jmx.internal.DisabledJmxServiceImpl</classname> -
A no-op implementation when JMX functionality is disabled.
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jmx.internal.JmxServiceImpl</classname> -
+ <classname>org.hibernate.jmx.internal.JmxServiceImpl</classname> -
Standard implementation of JMX handling
</para>
</listitem>
@@ -360,7 +360,7 @@
</section>
<section xml:id="services-JndiService">
- <title><interfacename>org.hibernate.service.jndi.spi.JndiService</interfacename></title>
+ <title><interfacename>org.hibernate.engine.jndi.spi.JndiService</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@@ -374,23 +374,23 @@
<term>Initiator</term>
<listitem>
<para>
- <classname>org.hibernate.service.jndi.internal.JndiServiceInitiator</classname>
+ <classname>org.hibernate.engine.jndi.internal.JndiServiceInitiator</classname>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Implementations</term>
<listitem>
<para>
- <classname>org.hibernate.service.jndi.internal.JndiServiceImpl</classname>
+ <classname>org.hibernate.engine.jndi.internal.JndiServiceImpl</classname>
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
<section xml:id="services-JtaPlatform">
- <title><interfacename>org.hibernate.service.jta.platform.spi.JtaPlatform</interfacename></title>
+ <title><interfacename>org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@@ -404,7 +404,7 @@
<term>Initiator</term>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.JtaPlatformInitiator</classname>
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator</classname>
</para>
<important>
<para>
@@ -423,103 +423,103 @@
<itemizedlist>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.BitronixJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.BitronixJtaPlatform</classname> -
Integration with the Bitronix stand-alone transaction manager.
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.BorlandEnterpriseServerJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.BorlandEnterpriseServerJtaPlatform</classname> -
Integration with the transaction manager as deployed within a Borland Enterprise Server
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.JBossAppServerJtaPlatform</classname> -
Integration with the transaction manager as deployed within a JBoss Application Server
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform</classname> -
Integration with the JBoss Transactions stand-alone transaction manager
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.JOTMJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.JOTMJtaPlatform</classname> -
Integration with the JOTM stand-alone transaction manager
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.JOnASJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.JOnASJtaPlatform</classname> -
Integration with the JOnAS transaction manager.
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.JRun4JtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.JRun4JtaPlatform</classname> -
Integration with the transaction manager as deployed in a JRun 4 application server.
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.NoJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform</classname> -
No-op version when no JTA set up is configured
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.OC4JJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.OC4JJtaPlatform</classname> -
Integration with transaction manager as deployed in an OC4J (Oracle) application
server.
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.OrionJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.OrionJtaPlatform</classname> -
Integration with transaction manager as deployed in an Orion application server.
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.ResinJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.ResinJtaPlatform</classname> -
Integration with transaction manager as deployed in a Resin application server.
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.SunOneJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.SunOneJtaPlatform</classname> -
Integration with transaction manager as deployed in a Sun ONE (7 and above)
application server.
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.TransactionManagerLookupBridge</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.TransactionManagerLookupBridge</classname> -
Provides a bridge to legacy (and deprecated)
<interfacename>org.hibernate.transaction.TransactionManagerLookup</interfacename>
implementations
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.WebSphereExtendedJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform</classname> -
Integration with transaction manager as deployed in a WebSphere Application Server
(6 and above).
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.WebSphereJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform</classname> -
Integration with transaction manager as deployed in a WebSphere Application Server
(4, 5.0 and 5.1).
</para>
</listitem>
<listitem>
<para>
- <classname>org.hibernate.service.jta.platform.internal.WeblogicJtaPlatform</classname> -
+ <classname>org.hibernate.engine.transaction.jta.platform.internal.WeblogicJtaPlatform</classname> -
Integration with transaction manager as deployed in a Weblogic application server.
</para>
</listitem>
@@ -530,7 +530,7 @@
</section>
<section xml:id="services-MultiTenantConnectionProvider">
- <title><interfacename>org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider</interfacename></title>
+ <title><interfacename>MultiTenantConnectionProvider</interfacename></title>
<variablelist>
<varlistentry>
<term>Notes</term>
@@ -875,27 +875,27 @@
Once a <interfacename>org.hibernate.service.ServiceRegistry</interfacename> is built it is considered
immutable; the services themselves might accept re-configuration, but immutability here means
adding/replacing services. So another role provided by the
- <classname>org.hibernate.service.ServiceRegistryBuilder</classname> is to allow tweaking of the services
+ <classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname> is to allow tweaking of the services
that will be contained in the <interfacename>org.hibernate.service.ServiceRegistry</interfacename>
generated from it.
</para>
<para>
- There are 2 means to tell a <classname>org.hibernate.service.ServiceRegistryBuilder</classname> about
+ There are 2 means to tell a <classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname> about
custom services.
</para>
<itemizedlist>
<listitem>
<para>
- Implement a <interfacename>org.hibernate.service.spi.BasicServiceInitiator</interfacename> class
+ Implement a <interfacename>org.hibernate.boot.registry.StandardServiceInitiator</interfacename> class
to control on-demand construction of the service class and add it to the
- <classname>org.hibernate.service.ServiceRegistryBuilder</classname> via its
+ <classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname> via its
<methodname>addInitiator</methodname> method.
</para>
</listitem>
<listitem>
<para>
Just instantiate the service class and add it to the
- <classname>org.hibernate.service.ServiceRegistryBuilder</classname> via its
+ <classname>org.hibernate.boot.registry.StandardServiceRegistryBuilder</classname> via its
<methodname>addService</methodname> method.
</para>
</listitem>
@@ -921,7 +921,7 @@
<para>
Instances of boot-strap registries are built using the
- <classname>org.hibernate.service.BootstrapServiceRegistryBuilder</classname> class.
+ <classname>org.hibernate.boot.registry.BootstrapServiceRegistryBuilder</classname> class.
</para>
<example xml:id="BootstrapServiceRegistryBuilder-example">
@@ -932,7 +932,7 @@
<section id="services-registry-bootstrap-services">
<title>Bootstrap registry services</title>
<section id="services-ClassLoaderService">
- <title><interfacename>org.hibernate.service.classloading.spi.ClassLoaderService</interfacename></title>
+ <title><interfacename>org.hibernate.boot.registry.classloading.spi.ClassLoaderService</interfacename></title>
<para>
Hibernate needs to interact with ClassLoaders. However, the manner in which Hibernate
(or any library) should interact with ClassLoaders varies based on the runtime environment
@@ -986,7 +986,7 @@
<para>
This service focuses on the discovery aspect. It leverages the standard Java
<classname>java.util.ServiceLoader</classname> capability provided by the
- <interfacename>org.hibernate.service.classloading.spi.ClassLoaderService</interfacename>
+ <interfacename>org.hibernate.boot.registry.classloading.spi.ClassLoaderService</interfacename>
in order to discover implementations of the
<interfacename>org.hibernate.integrator.spi.Integrator</interfacename> contract.
Integrators would simply define a file named
View
4 documentation/src/main/docbook/devguide/en-US/chapters/transactions/Transactions.xml
@@ -95,7 +95,7 @@
<para>
JTA-based transaction approach which leverages the
<interfacename>javax.transaction.UserTransaction</interfacename> interface as obtained from
- <interfacename>org.hibernate.service.jta.platform.spi.JtaPlatform</interfacename> API. This approach
+ <interfacename>org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform</interfacename> API. This approach
is represented by the
<classname>org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory</classname> class.
</para>
@@ -111,7 +111,7 @@
<para>
Another JTA-based transaction approach which leverages the JTA
<interfacename>javax.transaction.TransactionManager</interfacename> interface as obtained from
- <interfacename>org.hibernate.service.jta.platform.spi.JtaPlatform</interfacename> API. This approach
+ <interfacename>org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform</interfacename> API. This approach
is represented by the
<classname>org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory</classname> class. In
an actual JEE CMT environment, access to the
View
7 ...src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java
@@ -35,11 +35,12 @@
import org.hibernate.HibernateException;
import org.hibernate.cfg.Environment;
+import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.UnknownUnwrapTypeException;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.classloading.spi.ClassLoadingException;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;
View
2 hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java
@@ -32,7 +32,7 @@
import org.hibernate.engine.jdbc.spi.JdbcServices;
import org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.junit.Assert.assertEquals;
View
2 hibernate-core/src/main/java/org/hibernate/SessionFactory.java
@@ -71,7 +71,7 @@
* Open a {@link Session}.
* <p/>
* JDBC {@link Connection connection(s} will be obtained from the
- * configured {@link org.hibernate.service.jdbc.connections.spi.ConnectionProvider} as needed
+ * configured {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} as needed
* to perform requested work.
*
* @return The created session.
View
35 hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistry.java
@@ -0,0 +1,35 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.boot.registry;
+
+import org.hibernate.service.ServiceRegistry;
+
+/**
+ * Specialization of the {@link org.hibernate.service.ServiceRegistry} contract mainly to make the
+ * {@link StandardServiceRegistryBuilder#StandardServiceRegistryBuilder(BootstrapServiceRegistry)} signature type-safe
+ *
+ * @author Steve Ebersole
+ */
+public interface BootstrapServiceRegistry extends ServiceRegistry {
+}
View
152 ...rnate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java
@@ -0,0 +1,152 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.boot.registry;
+
+import java.util.LinkedHashSet;
+
+import org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl;
+import org.hibernate.integrator.internal.IntegratorServiceImpl;
+import org.hibernate.integrator.spi.Integrator;
+import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
+import org.hibernate.boot.registry.selector.internal.StrategySelectorBuilder;
+
+/**
+ * Builder for bootstrap {@link org.hibernate.service.ServiceRegistry} instances.
+ *
+ * @author Steve Ebersole
+ *
+ * @see BootstrapServiceRegistryImpl
+ * @see StandardServiceRegistryBuilder#StandardServiceRegistryBuilder(org.hibernate.boot.registry.BootstrapServiceRegistry)
+ */
+public class BootstrapServiceRegistryBuilder {
+ private final LinkedHashSet<Integrator> providedIntegrators = new LinkedHashSet<Integrator>();
+ private ClassLoader applicationClassLoader;
+ private ClassLoader resourcesClassLoader;
+ private ClassLoader hibernateClassLoader;
+ private ClassLoader environmentClassLoader;
+
+ private StrategySelectorBuilder strategySelectorBuilder = new StrategySelectorBuilder();
+
+ /**
+ * Add an {@link Integrator} to be applied to the bootstrap registry.
+ *
+ * @param integrator The integrator to add.
+ * @return {@code this}, for method chaining
+ */
+ public BootstrapServiceRegistryBuilder with(Integrator integrator) {
+ providedIntegrators.add( integrator );
+ return this;
+ }
+
+ /**
+ * Applies the specified {@link ClassLoader} as the application class loader for the bootstrap registry
+ *
+ * @param classLoader The class loader to use
+ * @return {@code this}, for method chaining
+ */
+ @SuppressWarnings( {"UnusedDeclaration"})
+ public BootstrapServiceRegistryBuilder withApplicationClassLoader(ClassLoader classLoader) {
+ this.applicationClassLoader = classLoader;
+ return this;
+ }
+
+ /**
+ * Applies the specified {@link ClassLoader} as the resource class loader for the bootstrap registry
+ *
+ * @param classLoader The class loader to use
+ * @return {@code this}, for method chaining
+ */
+ @SuppressWarnings( {"UnusedDeclaration"})
+ public BootstrapServiceRegistryBuilder withResourceClassLoader(ClassLoader classLoader) {
+ this.resourcesClassLoader = classLoader;
+ return this;
+ }
+
+ /**
+ * Applies the specified {@link ClassLoader} as the Hibernate class loader for the bootstrap registry
+ *
+ * @param classLoader The class loader to use
+ * @return {@code this}, for method chaining
+ */
+ @SuppressWarnings( {"UnusedDeclaration"})
+ public BootstrapServiceRegistryBuilder withHibernateClassLoader(ClassLoader classLoader) {
+ this.hibernateClassLoader = classLoader;
+ return this;
+ }
+
+ /**
+ * Applies the specified {@link ClassLoader} as the environment (or system) class loader for the bootstrap registry
+ *
+ * @param classLoader The class loader to use
+ * @return {@code this}, for method chaining
+ */
+ @SuppressWarnings( {"UnusedDeclaration"})
+ public BootstrapServiceRegistryBuilder withEnvironmentClassLoader(ClassLoader classLoader) {
+ this.environmentClassLoader = classLoader;
+ return this;
+ }
+
+ /**
+ * Applies a named strategy implementation to the bootstrap registry
+ *
+ * @param strategy The strategy
+ * @param name The registered name
+ * @param implementation The strategy implementation Class
+ *
+ * @return {@code this}, for method chaining
+ *
+ * @see org.hibernate.boot.registry.selector.spi.StrategySelector#registerStrategyImplementor(Class, String, Class)
+ */
+ @SuppressWarnings( {"UnusedDeclaration"})
+ public <T> BootstrapServiceRegistryBuilder withStrategySelector(Class<T> strategy, String name, Class<? extends T> implementation) {
+ this.strategySelectorBuilder.addCustomRegistration( strategy, name, implementation );
+ return this;
+ }
+
+ /**
+ * Build the bootstrap registry.
+ *
+ * @return The built bootstrap registry
+ */
+ public BootstrapServiceRegistry build() {
+ final ClassLoaderServiceImpl classLoaderService = new ClassLoaderServiceImpl(
+ applicationClassLoader,
+ resourcesClassLoader,
+ hibernateClassLoader,
+ environmentClassLoader
+ );
+
+ final IntegratorServiceImpl integratorService = new IntegratorServiceImpl(
+ providedIntegrators,
+ classLoaderService
+ );
+
+
+ return new BootstrapServiceRegistryImpl(
+ classLoaderService,
+ strategySelectorBuilder.buildSelector( classLoaderService ),
+ integratorService
+ );
+ }
+}
View
6 ...te/service/spi/BasicServiceInitiator.java → ...ot/registry/StandardServiceInitiator.java
@@ -21,18 +21,20 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.spi;
+package org.hibernate.boot.registry;
import java.util.Map;
import org.hibernate.service.Service;
+import org.hibernate.service.spi.ServiceInitiator;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
/**
* Contract for an initiator of services that target the standard {@link org.hibernate.service.ServiceRegistry}
*
* @author Steve Ebersole
*/
-public interface BasicServiceInitiator<R extends Service> extends ServiceInitiator<R> {
+public interface StandardServiceInitiator<R extends Service> extends ServiceInitiator<R> {
/**
* Initiates the managed service.
*
View
224 hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
@@ -0,0 +1,224 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.boot.registry;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.hibernate.cfg.Environment;
+import org.hibernate.integrator.spi.Integrator;
+import org.hibernate.integrator.spi.IntegratorService;
+import org.hibernate.integrator.spi.ServiceContributingIntegrator;
+import org.hibernate.internal.jaxb.cfg.JaxbHibernateConfiguration;
+import org.hibernate.internal.util.config.ConfigurationHelper;
+import org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl;
+import org.hibernate.service.ConfigLoader;
+import org.hibernate.service.Service;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.service.StandardServiceInitiators;
+import org.hibernate.service.internal.ProvidedService;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
+
+/**
+ * Builder for standard {@link org.hibernate.service.ServiceRegistry} instances.
+ *
+ * @author Steve Ebersole
+ *
+ * @see StandardServiceRegistryImpl
+ * @see org.hibernate.boot.registry.BootstrapServiceRegistryBuilder
+ */
+public class StandardServiceRegistryBuilder {
+ public static final String DEFAULT_CFG_RESOURCE_NAME = "hibernate.cfg.xml";
+
+ private final Map settings;
+ private final List<StandardServiceInitiator> initiators = standardInitiatorList();
+ private final List<ProvidedService> providedServices = new ArrayList<ProvidedService>();
+
+ private final BootstrapServiceRegistry bootstrapServiceRegistry;
+ private final ConfigLoader configLoader;
+
+ /**
+ * Create a default builder
+ */
+ public StandardServiceRegistryBuilder() {
+ this( new BootstrapServiceRegistryImpl() );
+ }
+
+ /**
+ * Create a builder with the specified bootstrap services.
+ *
+ * @param bootstrapServiceRegistry Provided bootstrap registry to use.
+ */
+ public StandardServiceRegistryBuilder(BootstrapServiceRegistry bootstrapServiceRegistry) {
+ this.settings = Environment.getProperties();
+ this.bootstrapServiceRegistry = bootstrapServiceRegistry;
+ this.configLoader = new ConfigLoader( bootstrapServiceRegistry );
+ }
+
+ /**
+ * Used from the {@link #initiators} variable initializer
+ *
+ * @return List of standard initiators
+ */
+ private static List<StandardServiceInitiator> standardInitiatorList() {
+ final List<StandardServiceInitiator> initiators = new ArrayList<StandardServiceInitiator>();
+ initiators.addAll( StandardServiceInitiators.LIST );
+ return initiators;
+ }
+
+ /**
+ * Read settings from a {@link Properties} file. Differs from {@link #configure()} and {@link #configure(String)}
+ * in that here we read a {@link Properties} file while for {@link #configure} we read the XML variant.
+ *
+ * @param resourceName The name by which to perform a resource look up for the properties file.
+ *
+ * @return this, for method chaining
+ *
+ * @see #configure()
+ * @see #configure(String)
+ */
+ @SuppressWarnings( {"unchecked"})
+ public StandardServiceRegistryBuilder loadProperties(String resourceName) {
+ settings.putAll( configLoader.loadProperties( resourceName ) );
+ return this;
+ }
+
+ /**
+ * Read setting information from an XML file using the standard resource location
+ *
+ * @return this, for method chaining
+ *
+ * @see #DEFAULT_CFG_RESOURCE_NAME
+ * @see #configure(String)
+ * @see #loadProperties(String)
+ */
+ public StandardServiceRegistryBuilder configure() {
+ return configure( DEFAULT_CFG_RESOURCE_NAME );
+ }
+
+ /**
+ * Read setting information from an XML file using the named resource location
+ *
+ * @param resourceName The named resource
+ *
+ * @return this, for method chaining
+ *
+ * @see #loadProperties(String)
+ */
+ @SuppressWarnings( {"unchecked"})
+ public StandardServiceRegistryBuilder configure(String resourceName) {
+ JaxbHibernateConfiguration configurationElement = configLoader.loadConfigXmlResource( resourceName );
+ for ( JaxbHibernateConfiguration.JaxbSessionFactory.JaxbProperty xmlProperty : configurationElement.getSessionFactory().getProperty() ) {
+ settings.put( xmlProperty.getName(), xmlProperty.getValue() );
+ }
+
+ return this;
+ }
+
+ /**
+ * Apply a setting value
+ *
+ * @param settingName The name of the setting
+ * @param value The value to use.
+ *
+ * @return this, for method chaining
+ */
+ @SuppressWarnings( {"unchecked", "UnusedDeclaration"})
+ public StandardServiceRegistryBuilder applySetting(String settingName, Object value) {
+ settings.put( settingName, value );
+ return this;
+ }
+
+ /**
+ * Apply a groups of setting values
+ *
+ * @param settings The incoming settings to apply
+ *
+ * @return this, for method chaining
+ */
+ @SuppressWarnings( {"unchecked", "UnusedDeclaration"})
+ public StandardServiceRegistryBuilder applySettings(Map settings) {
+ this.settings.putAll( settings );
+ return this;
+ }
+
+ /**
+ * Adds a service initiator.
+ *
+ * @param initiator The initiator to be added
+ *
+ * @return this, for method chaining
+ */
+ @SuppressWarnings( {"UnusedDeclaration"})
+ public StandardServiceRegistryBuilder addInitiator(StandardServiceInitiator initiator) {
+ initiators.add( initiator );
+ return this;
+ }
+
+ /**
+ * Adds a user-provided service
+ *
+ * @param serviceRole The role of the service being added
+ * @param service The service implementation
+ *
+ * @return this, for method chaining
+ */
+ @SuppressWarnings( {"unchecked"})
+ public StandardServiceRegistryBuilder addService(final Class serviceRole, final Service service) {
+ providedServices.add( new ProvidedService( serviceRole, service ) );
+ return this;
+ }
+
+ /**
+ * Build the service registry accounting for all settings and service initiators and services.
+ *
+ * @return The built service registry
+ */
+ public ServiceRegistry buildServiceRegistry() {
+ Map<?,?> settingsCopy = new HashMap();
+ settingsCopy.putAll( settings );
+ Environment.verifyProperties( settingsCopy );
+ ConfigurationHelper.resolvePlaceHolders( settingsCopy );
+
+ for ( Integrator integrator : bootstrapServiceRegistry.getService( IntegratorService.class ).getIntegrators() ) {
+ if ( ServiceContributingIntegrator.class.isInstance( integrator ) ) {
+ ServiceContributingIntegrator.class.cast( integrator ).prepareServices( this );
+ }
+ }
+
+ return new StandardServiceRegistryImpl( bootstrapServiceRegistry, initiators, providedServices, settingsCopy );
+ }
+
+ /**
+ * Destroy a service registry. Applications should only destroy registries they have explicitly created.
+ *
+ * @param serviceRegistry The registry to be closed.
+ */
+ public static void destroy(ServiceRegistry serviceRegistry) {
+ ( (StandardServiceRegistryImpl) serviceRegistry ).destroy();
+ }
+}
View
6 ...ding/internal/ClassLoaderServiceImpl.java → ...ding/internal/ClassLoaderServiceImpl.java
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.classloading.internal;
+package org.hibernate.boot.registry.classloading.internal;
import java.io.IOException;
import java.io.InputStream;
@@ -38,8 +38,8 @@
import org.jboss.logging.Logger;
import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.classloading.spi.ClassLoadingException;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
/**
* Standard implementation of the service for interacting with class loaders
View
2 .../classloading/spi/ClassLoaderService.java → .../classloading/spi/ClassLoaderService.java
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.classloading.spi;
+package org.hibernate.boot.registry.classloading.spi;
import java.io.InputStream;
import java.net.URL;
View
2 ...assloading/spi/ClassLoadingException.java → ...assloading/spi/ClassLoadingException.java
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.classloading.spi;
+package org.hibernate.boot.registry.classloading.spi;
import org.hibernate.HibernateException;
/**
View
19 ...nternal/BootstrapServiceRegistryImpl.java → ...nternal/BootstrapServiceRegistryImpl.java
@@ -1,7 +1,7 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
@@ -21,20 +21,20 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.internal;
+package org.hibernate.boot.registry.internal;
import java.util.LinkedHashSet;
import org.hibernate.integrator.internal.IntegratorServiceImpl;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.integrator.spi.IntegratorService;
-import org.hibernate.service.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
import org.hibernate.service.Service;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.selector.internal.StrategySelectorImpl;
-import org.hibernate.service.selector.spi.StrategySelector;
+import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.selector.internal.StrategySelectorImpl;
+import org.hibernate.boot.registry.selector.spi.StrategySelector;
import org.hibernate.service.spi.ServiceBinding;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceInitiator;
@@ -46,6 +46,11 @@
* <li>{@link IntegratorService}</li>
* </ul>
*
+ * IMPL NOTE : Currently implements the deprecated {@link org.hibernate.service.BootstrapServiceRegistry} contract
+ * so that the registry returned from the builder works on the deprecated sense. Once
+ * {@link org.hibernate.service.BootstrapServiceRegistry} goes away, this should be updated to instead implement
+ * {@link org.hibernate.boot.registry.BootstrapServiceRegistry}.
+ *
* @author Steve Ebersole
*/
public class BootstrapServiceRegistryImpl
View
12 ...internal/StandardServiceRegistryImpl.java → ...internal/StandardServiceRegistryImpl.java
@@ -21,15 +21,17 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.internal;
+package org.hibernate.boot.registry.internal;
import java.util.List;
import java.util.Map;
-import org.hibernate.service.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
import org.hibernate.service.Service;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.spi.BasicServiceInitiator;
+import org.hibernate.service.internal.AbstractServiceRegistryImpl;
+import org.hibernate.service.internal.ProvidedService;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.ServiceBinding;
import org.hibernate.service.spi.ServiceInitiator;
@@ -45,7 +47,7 @@
@SuppressWarnings( {"unchecked"})
public StandardServiceRegistryImpl(
BootstrapServiceRegistry bootstrapServiceRegistry,
- List<BasicServiceInitiator> serviceInitiators,
+ List<StandardServiceInitiator> serviceInitiators,
List<ProvidedService> providedServices,
Map<?, ?> configurationValues) {
super( bootstrapServiceRegistry );
@@ -66,7 +68,7 @@ public StandardServiceRegistryImpl(
@Override
public <R extends Service> R initiateService(ServiceInitiator<R> serviceInitiator) {
// todo : add check/error for unexpected initiator types?
- return ( (BasicServiceInitiator<R>) serviceInitiator ).initiateService( configurationValues, this );
+ return ( (StandardServiceInitiator<R>) serviceInitiator ).initiateService( configurationValues, this );
}
@Override
View
8 ...tor/internal/StrategySelectorBuilder.java → ...tor/internal/StrategySelectorBuilder.java
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.selector.internal;
+package org.hibernate.boot.registry.selector.internal;
import java.util.ArrayList;
import java.util.List;
@@ -32,9 +32,9 @@
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.engine.transaction.internal.jta.JtaTransactionFactory;
import org.hibernate.engine.transaction.spi.TransactionFactory;
-import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl;
-import org.hibernate.service.selector.spi.StrategySelectionException;
-import org.hibernate.service.selector.spi.StrategySelector;
+import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
+import org.hibernate.boot.registry.selector.spi.StrategySelectionException;
+import org.hibernate.boot.registry.selector.spi.StrategySelector;
/**
* @author Steve Ebersole
View
10 ...lector/internal/StrategySelectorImpl.java → ...lector/internal/StrategySelectorImpl.java
@@ -21,18 +21,18 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.selector.internal;
+package org.hibernate.boot.registry.selector.internal;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.jboss.logging.Logger;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.classloading.spi.ClassLoadingException;
-import org.hibernate.service.selector.spi.StrategySelectionException;
-import org.hibernate.service.selector.spi.StrategySelector;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
+import org.hibernate.boot.registry.selector.spi.StrategySelectionException;
+import org.hibernate.boot.registry.selector.spi.StrategySelector;
/**
* @author Steve Ebersole
View
1 hibernate-core/src/main/java/org/hibernate/boot/registry/selector/package-info.java
@@ -0,0 +1 @@
+package org.hibernate.boot.registry.selector;
View
2 ...ector/spi/StrategySelectionException.java → ...ector/spi/StrategySelectionException.java
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.selector.spi;
+package org.hibernate.boot.registry.selector.spi;
import org.hibernate.HibernateException;
View
2 ...ervice/selector/spi/StrategySelector.java → ...gistry/selector/spi/StrategySelector.java
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.selector.spi;
+package org.hibernate.boot.registry.selector.spi;
import org.hibernate.service.Service;
View
6 hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java
@@ -25,9 +25,9 @@
import java.util.Map;
+import org.hibernate.boot.registry.StandardServiceInitiator;
import org.hibernate.cache.spi.RegionFactory;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.spi.BasicServiceInitiator;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.ServiceException;
import org.hibernate.service.spi.ServiceRegistryImplementor;
@@ -36,7 +36,7 @@
*
* @author Hardy Ferentschik
*/
-public class RegionFactoryInitiator implements BasicServiceInitiator<RegionFactory> {
+public class RegionFactoryInitiator implements StandardServiceInitiator<RegionFactory> {
public static final RegionFactoryInitiator INSTANCE = new RegionFactoryInitiator();
/**
View
22 hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
@@ -44,10 +44,10 @@
public static final String SESSION_FACTORY_NAME_IS_JNDI = "hibernate.session_factory_name_is_jndi";
/**
- * Names the {@link org.hibernate.service.jdbc.connections.spi.ConnectionProvider} to use for obtaining
+ * Names the {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} to use for obtaining
* JDBC connections. Can either reference an instance of
- * {@link org.hibernate.service.jdbc.connections.spi.ConnectionProvider} or a {@link Class} or {@link String}
- * reference to the {@link org.hibernate.service.jdbc.connections.spi.ConnectionProvider} implementation
+ * {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} or a {@link Class} or {@link String}
+ * reference to the {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} implementation
* class.
*/
public static final String CONNECTION_PROVIDER ="hibernate.connection.provider_class";
@@ -64,7 +64,7 @@
/**
* Names the connection user. This might mean one of 2 things in out-of-the-box Hibernate
- * {@link org.hibernate.service.jdbc.connections.spi.ConnectionProvider}: <ul>
+ * {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider}: <ul>
* <li>The username used to pass along to creating the JDBC connection</li>
* <li>The username used to obtain a JDBC connection from a data source</li>
* </ul>
@@ -129,8 +129,8 @@
public static final String DIALECT ="hibernate.dialect";
/**
- * Names any additional {@link org.hibernate.service.jdbc.dialect.spi.DialectResolver} implementations to
- * register with the standard {@link org.hibernate.service.jdbc.dialect.spi.DialectFactory}.
+ * Names any additional {@link org.hibernate.engine.jdbc.dialect.spi.DialectResolver} implementations to
+ * register with the standard {@link org.hibernate.engine.jdbc.dialect.spi.DialectFactory}.
*/
public static final String DIALECT_RESOLVERS = "hibernate.dialect_resolvers";
@@ -275,9 +275,9 @@
public static final String TRANSACTION_STRATEGY = "hibernate.transaction.factory_class";
/**
- * Names the {@link org.hibernate.service.jta.platform.spi.JtaPlatform} implementation to use for integrating
- * with {@literal JTA} systems. Can reference either a {@link org.hibernate.service.jta.platform.spi.JtaPlatform}
- * instance or the name of the {@link org.hibernate.service.jta.platform.spi.JtaPlatform} implementation class
+ * Names the {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation to use for integrating
+ * with {@literal JTA} systems. Can reference either a {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform}
+ * instance or the name of the {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation class
* @since 4.0
*/
public static final String JTA_PLATFORM = "hibernate.transaction.jta.platform";
@@ -570,9 +570,9 @@
public static final String MULTI_TENANT = "hibernate.multiTenancy";
/**
- * Names a {@link org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider} implementation to
+ * Names a {@link org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider} implementation to
* use. As MultiTenantConnectionProvider is also a service, can be configured directly through the
- * {@link org.hibernate.service.ServiceRegistryBuilder}
+ * {@link org.hibernate.boot.registry.StandardServiceRegistryBuilder}
*
* @since 4.1
*/
View
8 hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
@@ -81,6 +81,7 @@
import org.hibernate.annotations.common.reflection.ReflectionManager;
import org.hibernate.annotations.common.reflection.XClass;
import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.annotations.reflection.JPAMetadataProvider;
import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
import org.hibernate.dialect.Dialect;
@@ -136,8 +137,7 @@
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.secure.internal.JACCConfiguration;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
-import org.hibernate.service.internal.StandardServiceRegistryImpl;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.hibernate.tool.hbm2ddl.IndexMetadata;
import org.hibernate.tool.hbm2ddl.TableMetadata;
@@ -163,7 +163,7 @@
* A new <tt>Configuration</tt> will use the properties specified in
* <tt>hibernate.properties</tt> by default.
* <p/>
- * NOTE : This will be replaced by use of {@link ServiceRegistryBuilder} and
+ * NOTE : This will be replaced by use of {@link org.hibernate.boot.registry.StandardServiceRegistryBuilder} and
* {@link org.hibernate.metamodel.MetadataSources} instead after the 4.0 release at which point this class will become
* deprecated and scheduled for removal in 5.0. See
* <a href="http://opensource.atlassian.com/projects/hibernate/browse/HHH-6183">HHH-6183</a>,
@@ -1770,7 +1770,7 @@ public SessionFactory buildSessionFactory(ServiceRegistry serviceRegistry) throw
public SessionFactory buildSessionFactory() throws HibernateException {
Environment.verifyProperties( properties );
ConfigurationHelper.resolvePlaceHolders( properties );
- final ServiceRegistry serviceRegistry = new ServiceRegistryBuilder()
+ final ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
.applySettings( properties )
.buildServiceRegistry();
setSessionFactoryObserver(
View
2 hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
@@ -76,7 +76,7 @@
* </tr>
* <tr>
* <td><tt>hibernate.connection.provider_class</tt></td>
- * <td>classname of <tt>org.hibernate.service.jdbc.connections.spi.ConnectionProvider</tt>
+ * <td>classname of <tt>ConnectionProvider</tt>
* subclass (if not specified hueristics are used)</td>
* </tr>
* <tr><td><tt>hibernate.connection.username</tt></td><td>database username</td></tr>
View
2 hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
@@ -31,7 +31,7 @@
import org.hibernate.cache.spi.QueryCacheFactory;
import org.hibernate.cache.spi.RegionFactory;
import org.hibernate.hql.spi.QueryTranslatorFactory;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.tuple.entity.EntityTuplizerFactory;
/**
View
8 hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
@@ -46,10 +46,10 @@
import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
import org.hibernate.tuple.entity.EntityTuplizerFactory;
/**
View
2 hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java
@@ -43,7 +43,7 @@
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.metamodel.source.MetadataImplementor;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
/**
View
2 hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java
@@ -39,7 +39,7 @@
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.service.jta.platform.spi.JtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
/**
* An implementation of {@link CurrentSessionContext} which scopes the notion
View
8 ...ig/internal/ConfigurationServiceImpl.java → ...ig/internal/ConfigurationServiceImpl.java
@@ -21,17 +21,17 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.config.internal;
+package org.hibernate.engine.config.internal;
import java.util.Collections;
import java.util.Map;
import org.jboss.logging.Logger;
import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.service.classloading.spi.ClassLoaderService;
-import org.hibernate.service.classloading.spi.ClassLoadingException;
-import org.hibernate.service.config.spi.ConfigurationService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
+import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.service.spi.ServiceRegistryAwareService;
import org.hibernate.service.spi.ServiceRegistryImplementor;
View
8 ...ternal/ConfigurationServiceInitiator.java → ...ternal/ConfigurationServiceInitiator.java
@@ -21,18 +21,18 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-package org.hibernate.service.config.internal;
+package org.hibernate.engine.config.internal;
import java.util.Map;
-import org.hibernate.service.config.spi.ConfigurationService;
-import org.hibernate.service.spi.BasicServiceInitiator;
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.engine.config.spi.ConfigurationService;