[hibernate/hibernate-orm] 37542f: HHH-6823 - Short-name config values
by GitHub
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-orm
Commit: 37542fe1f17379ec3b4497a9736bcfca1b3cc488
https://github.com/hibernate/hibernate-orm/commit/37542fe1f17379ec3b4497a...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2012-08-29 (Wed, 29 Aug 2012)
Changed paths:
M documentation/src/main/docbook/devguide/en-US/chapters/services/Services.xml
M documentation/src/main/docbook/manual/en-US/content/architecture.xml
M documentation/src/main/docbook/manual/en-US/content/configuration.xml
M hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
M hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
M hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java
M hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java
R hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerLookupBridge.java
M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
R hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java
R hibernate-core/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java
R hibernate-core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java
R hibernate-core/src/main/java/org/hibernate/jmx/StatisticsService.java
R hibernate-core/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java
R hibernate-core/src/main/java/org/hibernate/transaction/TransactionManagerLookup.java
R hibernate-core/src/main/java/org/hibernate/transaction/package.html
M hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java
R hibernate-core/src/test/java/org/hibernate/jmx/Entity.hbm.xml
R hibernate-core/src/test/java/org/hibernate/jmx/Entity.java
R hibernate-core/src/test/java/org/hibernate/jmx/TrivialTest.java
R hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTransactionManagerLookup.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
R hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionManagerLookup.java
Log Message:
-----------
HHH-6823 - Short-name config values
11 years, 8 months
[hibernate/hibernate-orm] 4ad49a: HHH-7556 - Clean up packages
by GitHub
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-orm
Commit: 4ad49a02c9058831e2652e84de722220335b2780
https://github.com/hibernate/hibernate-orm/commit/4ad49a02c9058831e2652e8...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2012-08-28 (Tue, 28 Aug 2012)
Changed paths:
M changelog.txt
M documentation/src/main/docbook/devguide/en-US/Database_Access.xml
M documentation/src/main/docbook/devguide/en-US/chapters/multitenancy/Multi_Tenancy.xml
M documentation/src/main/docbook/devguide/en-US/chapters/services/Services.xml
M documentation/src/main/docbook/devguide/en-US/chapters/transactions/Transactions.xml
M hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java
M hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java
M hibernate-core/src/main/java/org/hibernate/SessionFactory.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistry.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceInitiator.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoaderService.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/spi/ClassLoadingException.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/selector/package-info.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelectionException.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/StrategySelector.java
M hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java
M hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
M hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
M hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
M hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java
M hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java
A hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java
A hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceInitiator.java
A hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java
M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderInitiator.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/MultiTenantConnectionProviderInitiator.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/MultiTenantConnectionProvider.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/RefCursorSupportInitiator.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/AbstractDialectResolver.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/BasicDialectResolver.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryImpl.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectFactoryInitiator.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverInitiator.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/DialectResolverSet.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolver.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectFactory.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/DialectResolver.java
M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java
M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java
M hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcConnectionAccess.java
M hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java
A hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiException.java
A hibernate-core/src/main/java/org/hibernate/engine/jndi/JndiNameException.java
A hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java
A hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceInitiator.java
A hibernate-core/src/main/java/org/hibernate/engine/jndi/spi/JndiService.java
M hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java
M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionFactoryInitiator.java
M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaTransactionFactory.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerLookupBridge.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java
A hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatformException.java
M hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/AbstractTransactionImpl.java
M hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionEnvironment.java
M hibernate-core/src/main/java/org/hibernate/id/factory/internal/MutableIdentifierGeneratorFactoryInitiator.java
M hibernate-core/src/main/java/org/hibernate/integrator/internal/IntegratorServiceImpl.java
M hibernate-core/src/main/java/org/hibernate/integrator/spi/ServiceContributingIntegrator.java
M hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
M hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
M hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java
M hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureCallImpl.java
M hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureOutputsImpl.java
M hibernate-core/src/main/java/org/hibernate/internal/TransactionEnvironmentImpl.java
M hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java
M hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiHelper.java
M hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java
M hibernate-core/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java
M hibernate-core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java
A hibernate-core/src/main/java/org/hibernate/jmx/internal/DisabledJmxServiceImpl.java
A hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java
A hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceInitiator.java
R hibernate-core/src/main/java/org/hibernate/jmx/package.html
A hibernate-core/src/main/java/org/hibernate/jmx/spi/JmxService.java
M hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
M hibernate-core/src/main/java/org/hibernate/metamodel/domain/JavaType.java
M hibernate-core/src/main/java/org/hibernate/metamodel/domain/Type.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationBindingContextImpl.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationMetadataSourceProcessorImpl.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/JandexHelper.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IndexBuilder.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/MockHelper.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/Helper.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/IdentifierGeneratorResolver.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
M hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterClassResolverInitiator.java
M hibernate-core/src/main/java/org/hibernate/persister/internal/PersisterFactoryInitiator.java
M hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistry.java
M hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistryBuilder.java
M hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java
M hibernate-core/src/main/java/org/hibernate/service/ServiceRegistry.java
M hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
M hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
R hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceImpl.java
R hibernate-core/src/main/java/org/hibernate/service/classloading/spi/ClassLoaderService.java
R hibernate-core/src/main/java/org/hibernate/service/classloading/spi/ClassLoadingException.java
R hibernate-core/src/main/java/org/hibernate/service/config/internal/ConfigurationServiceImpl.java
R hibernate-core/src/main/java/org/hibernate/service/config/internal/ConfigurationServiceInitiator.java
R hibernate-core/src/main/java/org/hibernate/service/config/spi/ConfigurationService.java
M hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
R hibernate-core/src/main/java/org/hibernate/service/internal/BootstrapServiceRegistryImpl.java
M hibernate-core/src/main/java/org/hibernate/service/internal/JaxbProcessor.java
M hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java
M hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryInitiator.java
R hibernate-core/src/main/java/org/hibernate/service/internal/StandardServiceRegistryImpl.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/ConnectionProviderInitiator.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/MultiTenantConnectionProviderInitiator.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/ConnectionProvider.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/MultiTenantConnectionProvider.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/cursor/internal/RefCursorSupportInitiator.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/cursor/internal/StandardRefCursorSupport.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/cursor/spi/RefCursorSupport.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/AbstractDialectResolver.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/BasicDialectResolver.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectFactoryImpl.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectFactoryInitiator.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectResolverInitiator.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectResolverSet.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/spi/DialectFactory.java
R hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/spi/DialectResolver.java
R hibernate-core/src/main/java/org/hibernate/service/jmx/internal/DisabledJmxServiceImpl.java
R hibernate-core/src/main/java/org/hibernate/service/jmx/internal/JmxServiceImpl.java
R hibernate-core/src/main/java/org/hibernate/service/jmx/internal/JmxServiceInitiator.java
R hibernate-core/src/main/java/org/hibernate/service/jmx/spi/JmxService.java
R hibernate-core/src/main/java/org/hibernate/service/jndi/JndiException.java
R hibernate-core/src/main/java/org/hibernate/service/jndi/JndiNameException.java
R hibernate-core/src/main/java/org/hibernate/service/jndi/internal/JndiServiceImpl.java
R hibernate-core/src/main/java/org/hibernate/service/jndi/internal/JndiServiceInitiator.java
R hibernate-core/src/main/java/org/hibernate/service/jndi/spi/JndiService.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/AbstractJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/BitronixJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JBossAppServerJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JBossStandAloneJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JOTMJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JOnASJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JRun4JtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaSynchronizationStrategy.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/NoJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/OC4JJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/OrionJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/ResinJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/SunOneJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/SynchronizationRegistryAccess.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/TransactionManagerAccess.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/TransactionManagerLookupBridge.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/WebSphereExtendedJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/WebSphereJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/WeblogicJtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/spi/JtaPlatform.java
R hibernate-core/src/main/java/org/hibernate/service/jta/platform/spi/JtaPlatformException.java
R hibernate-core/src/main/java/org/hibernate/service/selector/internal/StrategySelectorBuilder.java
R hibernate-core/src/main/java/org/hibernate/service/selector/internal/StrategySelectorImpl.java
R hibernate-core/src/main/java/org/hibernate/service/selector/package-info.java
R hibernate-core/src/main/java/org/hibernate/service/selector/spi/StrategySelectionException.java
R hibernate-core/src/main/java/org/hibernate/service/selector/spi/StrategySelector.java
R hibernate-core/src/main/java/org/hibernate/service/spi/BasicServiceInitiator.java
M hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
M hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java
M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractorInitiator.java
M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java
M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java
M hibernate-core/src/test/java/org/hibernate/connection/PropertiesTest.java
M hibernate-core/src/test/java/org/hibernate/dialect/TestingDialects.java
M hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java
M hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectResolverTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java
M hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicCollectionBindingTests.java
M hibernate-core/src/test/java/org/hibernate/metamodel/binding/SimpleValueBindingTests.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/IdentifierGeneratorTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/MapsIdTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinderTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/QueryBinderTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/BaseAnnotationIndexTestCase.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/JandexHelperTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractMockerTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/mocker/XmlHelper.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImplTest.java
M hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java
M hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java
M hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java
M hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java
M hibernate-core/src/test/java/org/hibernate/test/common/TransactionEnvironmentImpl.java
M hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
M hibernate-core/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java
M hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java
M hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java
M hibernate-core/src/test/java/org/hibernate/test/fileimport/CommandExtractorServiceTest.java
M hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java
M hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java
M hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BatchingTest.java
M hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java
M hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
M hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java
M hibernate-core/src/test/java/org/hibernate/test/multitenancy/ConfigurationValidationTest.java
M hibernate-core/src/test/java/org/hibernate/test/multitenancy/TestingConnectionProvider.java
M hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java
M hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
M hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java
M hibernate-core/src/test/java/org/hibernate/test/transaction/jdbc/TestExpectedUsage.java
M hibernate-core/src/test/java/org/hibernate/test/transaction/jta/BasicDrivingTest.java
M hibernate-core/src/test/java/org/hibernate/test/transaction/jta/ManagedDrivingTest.java
M hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java
M hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
M hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java
M hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
M hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
M hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java
M hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java
M hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java
M hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java
M hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java
M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JtaPlatformImpl.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeJtaPlatform.java
M hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java
M hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
M hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
M hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
M hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
M hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
Log Message:
-----------
HHH-7556 - Clean up packages
11 years, 8 months
[hibernate/hibernate-orm] d52a20: HHH-7552 - New StrategySelectorService : initial w...
by GitHub
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-orm
Commit: d52a20a6933bbcc344839c0b0c8cb91fd2eb491f
https://github.com/hibernate/hibernate-orm/commit/d52a20a6933bbcc344839c0...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2012-08-27 (Mon, 27 Aug 2012)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionFactoryInitiator.java
M hibernate-core/src/main/java/org/hibernate/service/BootstrapServiceRegistryBuilder.java
M hibernate-core/src/main/java/org/hibernate/service/internal/BootstrapServiceRegistryImpl.java
A hibernate-core/src/main/java/org/hibernate/service/selector/internal/StrategySelectorBuilder.java
A hibernate-core/src/main/java/org/hibernate/service/selector/internal/StrategySelectorImpl.java
A hibernate-core/src/main/java/org/hibernate/service/selector/package-info.java
A hibernate-core/src/main/java/org/hibernate/service/selector/spi/StrategySelectionException.java
A hibernate-core/src/main/java/org/hibernate/service/selector/spi/StrategySelector.java
M hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java
Log Message:
-----------
HHH-7552 - New StrategySelectorService : initial work
11 years, 8 months
Hibernate SVN: r21055 - in core/branches/Branch_3_3_2_GA_CP: testsuite/src/test/java/org/hibernate/test/sql/hand/query and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: brmeyer
Date: 2012-08-27 13:21:09 -0400 (Mon, 27 Aug 2012)
New Revision: 21055
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ParameterParser.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java
Log:
JBPAPP-9706 Can't use := for variable assignment within a SQL-Statement
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ParameterParser.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ParameterParser.java 2012-08-27 15:42:09 UTC (rev 21054)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ParameterParser.java 2012-08-27 17:21:09 UTC (rev 21055)
@@ -82,6 +82,10 @@
inQuote = true;
recognizer.other( c );
}
+ else if ( '\\' == c ) {
+ // skip sending the backslash and instead send then next character, treating is as a literal
+ recognizer.other( sqlString.charAt( ++indx ) );
+ }
else {
if ( c == ':' ) {
// named parameter
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java 2012-08-27 15:42:09 UTC (rev 21054)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java 2012-08-27 17:21:09 UTC (rev 21055)
@@ -13,10 +13,13 @@
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
import org.hibernate.Query;
+import org.hibernate.QueryException;
+import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.MySQL5Dialect;
import org.hibernate.junit.functional.FunctionalTestCase;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.test.sql.hand.Dimension;
@@ -665,6 +668,18 @@
t.commit();
s.close();
}
+
+ public void testEscapeColonInSQL() throws QueryException {
+ if (getDialect() instanceof MySQL5Dialect) {
+ Session s = openSession();
+ Transaction t = s.beginTransaction();
+ SQLQuery query = s.createSQLQuery( "SELECT @row \\:= 1" );
+ List list = query.list();
+ assertTrue( list.get( 0 ).toString().equals( "1" ) );
+ t.commit();
+ s.close();
+ }
+ }
private static class UpperCasedAliasToEntityMapResultTransformer extends BasicTransformerAdapter implements Serializable {
public Object transformTuple(Object[] tuple, String[] aliases) {
11 years, 8 months
Hibernate SVN: r21054 - annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: brmeyer
Date: 2012-08-27 11:42:09 -0400 (Mon, 27 Aug 2012)
New Revision: 21054
Added:
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/ATable.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/CollectionAliasTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/ReorderedMappingsCollectionAliasTest.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableA.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableB.java
annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableBId.java
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
core/branches/Branch_3_3_2_GA_CP/parent/pom.xml
Log:
JBPAPP-9744 Aliases for a collection key and element column can collide causing one to be excluded
Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/ATable.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/ATable.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/ATable.java 2012-08-27 15:42:09 UTC (rev 21054)
@@ -0,0 +1,119 @@
+/*
+ * 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.test.collectionalias;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+/**
+ * @author Dave Stephan
+ */
+@Entity
+public class ATable implements Serializable
+{
+ private Integer firstId;
+
+ private List<TableB> tablebs = new ArrayList<TableB>();
+
+ public ATable()
+ {
+ }
+
+ /** minimal constructor */
+ public ATable(Integer firstId)
+ {
+ this.firstId = firstId;
+ }
+
+ @Id
+ @Column(name = "idcolumn", nullable = false)
+ public Integer getFirstId()
+ {
+ return this.firstId;
+ }
+
+ public void setFirstId(Integer firstId)
+ {
+ this.firstId = firstId;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((firstId == null) ? 0 : firstId.hashCode());
+ result = prime * result + ((tablebs == null) ? 0 : tablebs.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ ATable other = (ATable) obj;
+ if (firstId == null)
+ {
+ if (other.firstId != null)
+ return false;
+ }
+ else if (!firstId.equals(other.firstId))
+ return false;
+ if (tablebs == null)
+ {
+ if (other.tablebs != null)
+ return false;
+ }
+ else if (!tablebs.equals(other.tablebs))
+ return false;
+ return true;
+ }
+
+
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tablea")
+ public List<TableB> getTablebs()
+ {
+ return tablebs;
+ }
+
+ public void setTablebs(List<TableB> tablebs)
+ {
+ this.tablebs = tablebs;
+ }
+
+
+}
Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/CollectionAliasTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/CollectionAliasTest.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/CollectionAliasTest.java 2012-08-27 15:42:09 UTC (rev 21054)
@@ -0,0 +1,71 @@
+/*
+ * 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.test.collectionalias;
+
+import org.hibernate.Session;
+import org.hibernate.test.annotations.TestCase;
+
+/**
+ * @author Dave Stephan
+ * @author Gail Badner
+ * @author Brett Meyer
+ */
+public class CollectionAliasTest extends TestCase {
+
+ public void testCollectionAlias() {
+ Session s = openSession();
+ s.getTransaction().begin();
+ ATable aTable = new ATable( 1 );
+ TableB tableB = new TableB(
+ new TableBId( 1, "a", "b" )
+ );
+ aTable.getTablebs().add( tableB );
+ tableB.setTablea( aTable );
+ s.save( aTable );
+ s.getTransaction().commit();
+ s.close();
+
+ s = openSession();
+ aTable = (ATable) s.createQuery( "select distinct tablea from ATable tablea LEFT JOIN FETCH tablea.tablebs " ).uniqueResult();
+ assertEquals( new Integer( 1 ), aTable.getFirstId() );
+ assertEquals( 1, aTable.getTablebs().size() );
+ tableB = aTable.getTablebs().get( 0 );
+ assertSame( aTable, tableB.getTablea() );
+ assertEquals( new Integer( 1 ), tableB.getId().getFirstId() );
+ assertEquals( "a", tableB.getId().getSecondId() );
+ assertEquals( "b", tableB.getId().getThirdId() );
+ s.close();
+ }
+
+ @Override
+ protected Class[] getAnnotatedClasses() {
+ return new Class[] {
+ TableBId.class,
+ TableB.class,
+ TableA.class,
+ ATable.class
+ };
+ }
+
+}
Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/ReorderedMappingsCollectionAliasTest.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/ReorderedMappingsCollectionAliasTest.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/ReorderedMappingsCollectionAliasTest.java 2012-08-27 15:42:09 UTC (rev 21054)
@@ -0,0 +1,45 @@
+/*
+ * 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.test.collectionalias;
+
+/**
+ * The bug fixed by HHH-7545 showed showed different results depending on the order
+ * in which entity mappings were processed.
+ *
+ * This mappings are in the opposite order here than in CollectionAliasTest.
+ *
+ * @Author Gail Badner
+ */
+public class ReorderedMappingsCollectionAliasTest extends CollectionAliasTest {
+
+ @Override
+ protected Class[] getAnnotatedClasses() {
+ return new Class[] {
+ ATable.class,
+ TableA.class,
+ TableB.class,
+ TableBId.class,
+ };
+ }
+}
Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableA.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableA.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableA.java 2012-08-27 15:42:09 UTC (rev 21054)
@@ -0,0 +1,113 @@
+/*
+ * 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.test.collectionalias;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * @author Dave Stephan
+ */
+@Entity
+public class TableA
+{
+ @Id
+ private int id;
+
+ private String test;
+
+ private String test2;
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + id;
+ result = prime * result + ((test == null) ? 0 : test.hashCode());
+ result = prime * result + ((test2 == null) ? 0 : test2.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ TableA other = (TableA) obj;
+ if (id != other.id)
+ return false;
+ if (test == null)
+ {
+ if (other.test != null)
+ return false;
+ }
+ else if (!test.equals(other.test))
+ return false;
+ if (test2 == null)
+ {
+ if (other.test2 != null)
+ return false;
+ }
+ else if (!test2.equals(other.test2))
+ return false;
+ return true;
+ }
+
+ public String getTest2()
+ {
+ return test2;
+ }
+
+ public void setTest2(String test2)
+ {
+ this.test2 = test2;
+ }
+
+ public String getTest()
+ {
+ return test;
+ }
+
+ public void setTest(String test)
+ {
+ this.test = test;
+ }
+
+ public int getId()
+ {
+ return id;
+ }
+
+ public void setId(int id)
+ {
+ this.id = id;
+ }
+
+
+}
Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableB.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableB.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableB.java 2012-08-27 15:42:09 UTC (rev 21054)
@@ -0,0 +1,118 @@
+/*
+ * 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.test.collectionalias;
+
+import java.io.Serializable;
+
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+
+/**
+ * @author Dave Stephan
+ */
+@Entity
+public class TableB implements Serializable
+{
+
+ private TableBId id;
+
+ private ATable tablea;
+
+ public TableB() {
+ }
+
+ /** full constructor */
+ public TableB(TableBId id) {
+ this.id = id;
+ }
+
+ // Property accessors
+ @EmbeddedId
+ @AttributeOverrides( {
+ @AttributeOverride(name = "firstId", column = @Column(name = "idcolumn", nullable = false)),
+ @AttributeOverride(name = "secondId", column = @Column(name = "idcolumn_second", nullable = false, length = 50)),
+ @AttributeOverride(name = "thirdId", column = @Column(name = "thirdcolumn", nullable = false, length = 20)) })
+ public TableBId getId() {
+ return this.id;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((tablea == null) ? 0 : tablea.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ TableB other = (TableB) obj;
+ if (id == null)
+ {
+ if (other.id != null)
+ return false;
+ }
+ else if (!id.equals(other.id))
+ return false;
+ if (tablea == null)
+ {
+ if (other.tablea != null)
+ return false;
+ }
+ else if (!tablea.equals(other.tablea))
+ return false;
+ return true;
+ }
+
+ public void setId(TableBId id) {
+ this.id = id;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumns( { @JoinColumn(name = "idcolumn", referencedColumnName = "idcolumn", nullable = false, insertable = false, updatable = false) })
+ public ATable getTablea() {
+ return tablea;
+ }
+
+ public void setTablea(ATable tablea) {
+ this.tablea = tablea;
+ }
+
+}
Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableBId.java
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableBId.java (rev 0)
+++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/collectionalias/TableBId.java 2012-08-27 15:42:09 UTC (rev 21054)
@@ -0,0 +1,133 @@
+/*
+ * 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.test.collectionalias;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author Dave Stephan
+ */
+@Embeddable
+public class TableBId implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ // Fields
+
+ private Integer firstId;
+
+ private String secondId;
+
+ private String thirdId;
+
+ // Constructors
+
+ /** default constructor */
+ public TableBId() {
+ }
+
+ /** full constructor */
+ public TableBId(Integer firstId, String secondId, String thirdId) {
+ this.firstId = firstId;
+ this.secondId = secondId;
+ this.thirdId = thirdId;
+ }
+
+ // Property accessors
+
+ @Column(name = "idcolumn", nullable = false)
+ public Integer getFirstId() {
+ return this.firstId;
+ }
+
+ public void setFirstId(Integer firstId) {
+ this.firstId = firstId;
+ }
+
+ @Column(name = "idcolumn_second", nullable = false, length = 50)
+ public String getSecondId() {
+ return this.secondId;
+ }
+
+ public void setSecondId(String secondId) {
+ this.secondId = secondId;
+ }
+
+ @Column(name = "thirdcolumn", nullable = false, length = 50)
+ public String getThirdId() {
+ return this.thirdId;
+ }
+
+ public void setThirdId(String thirdId) {
+ this.thirdId = thirdId;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((firstId == null) ? 0 : firstId.hashCode());
+ result = prime * result + ((secondId == null) ? 0 : secondId.hashCode());
+ result = prime * result + ((thirdId == null) ? 0 : thirdId.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ TableBId other = (TableBId) obj;
+ if (firstId == null)
+ {
+ if (other.firstId != null)
+ return false;
+ }
+ else if (!firstId.equals(other.firstId))
+ return false;
+ if (secondId == null)
+ {
+ if (other.secondId != null)
+ return false;
+ }
+ else if (!secondId.equals(other.secondId))
+ return false;
+ if (thirdId == null)
+ {
+ if (other.thirdId != null)
+ return false;
+ }
+ else if (!thirdId.equals(other.thirdId))
+ return false;
+ return true;
+ }
+}
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java 2012-08-27 15:35:44 UTC (rev 21053)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java 2012-08-27 15:42:09 UTC (rev 21054)
@@ -335,7 +335,7 @@
iter = collection.getElement().getColumnIterator();
while ( iter.hasNext() ) {
Selectable selectable = (Selectable) iter.next();
- elementColumnAliases[j] = selectable.getAlias(dialect);
+ elementColumnAliases[j] = selectable.getAlias(dialect, table);
if ( selectable.isFormula() ) {
Formula form = (Formula) selectable;
elementFormulaTemplates[j] = form.getTemplate(dialect, factory.getSqlFunctionRegistry());
Modified: core/branches/Branch_3_3_2_GA_CP/parent/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/parent/pom.xml 2012-08-27 15:35:44 UTC (rev 21053)
+++ core/branches/Branch_3_3_2_GA_CP/parent/pom.xml 2012-08-27 15:42:09 UTC (rev 21054)
@@ -235,94 +235,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
</plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.jboss.maven.plugins
- </groupId>
- <artifactId>
- maven-injection-plugin
- </artifactId>
- <versionRange>
- [1.0.2,)
- </versionRange>
- <goals>
- <goal>bytecode</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>
- [1.3,)
- </versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.jboss.maven.plugins
- </groupId>
- <artifactId>
- maven-test-ext-plugin
- </artifactId>
- <versionRange>
- [1.1.0,)
- </versionRange>
- <goals>
- <goal>extend</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.codehaus.mojo
- </groupId>
- <artifactId>
- antlr-maven-plugin
- </artifactId>
- <versionRange>
- [2.1,)
- </versionRange>
- <goals>
- <goal>generate</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
</build>
11 years, 8 months