Author: stliu Date: 2010-08-04 01:41:23 -0400 (Wed, 04 Aug 2010) New Revision: 20105 Modified: core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/BasicRegionAdapter.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/CollectionRegionImpl.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/ReadOnlyAccess.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/EntityRegionImpl.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/OptimisticReadOnlyAccess.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/ReadOnlyAccess.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/TransactionalAccess.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractCollectionRegionAccessStrategyTestCase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticInvalidatedTransactionalTestCase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReadOnlyTestCase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticInvalidatedTransactionalTestCase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticReadOnlyTestCase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractEntityRegionAccessStrategyTestCase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticInvalidatedTransactionalTestCase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReadOnlyTestCase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticInvalidatedTransactionalTestCase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticReadOnlyTestCase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticEntityReplicationTest.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/util/CacheTestSupport.java core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/src/main/java/org/hibernate/cache/SwarmCache.java core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/src/main/java/org/hibernate/cache/SwarmCacheProvider.java core/branches/Branch_3_3_2_GA_CP/connection-c3p0/src/main/java/org/hibernate/connection/C3P0ConnectionProvider.java core/branches/Branch_3_3_2_GA_CP/connection-proxool/src/main/java/org/hibernate/connection/ProxoolConnectionProvider.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/EntityMode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Filter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Hibernate.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/SessionFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionRecreateAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionRemoveAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionUpdateAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityDeleteAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityInsertAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityUpdateAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/Executable.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/AbstractClassTransformerImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/InstrumentedClassLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/JavassistInstrumenter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/FastClass.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/ProxyFactoryFactoryImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/ReflectionOptimizerImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/TransformingClassLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/ByteCodeHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/CollectionRegion.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/EntityRegion.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/HashtableCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/QueryCacheFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/QueryKey.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/ReadOnlyCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/ReadWriteCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/StandardQueryCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/StandardQueryCacheFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/TransactionalCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/access/EntityRegionAccessStrategy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/CacheDataDescriptionImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/NoCachingRegionFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseGeneralDataRegionAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseTransactionalDataRegionAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionAccessStrategyAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/EntityAccessStrategyAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/OptimisticCacheSourceAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/QueryResultsRegionAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/TimestampsRegionAdapter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Configuration.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/HbmBinder.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Mappings.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/ResultSetMappingBinder.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Settings.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/SettingsFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentElementHolder.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentIdentifierBag.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentIndexedElementHolder.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/DatasourceConnectionProvider.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/DriverManagerConnectionProvider.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/UserSuppliedConnectionProvider.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/CurrentSessionContext.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/JTASessionContext.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/ManagedSessionContext.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/InExpression.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/SubqueryExpression.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Cache71Dialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/DB2Dialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/DerbyDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Dialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/FrontBaseDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/HSQLDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/InformixDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/IngresDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/MckoiDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle10gDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/OracleDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/PointbaseDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SAPDBDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/TimesTenDialect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/TypeNames.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/AbstractAnsiTrimEmulationFunction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/ConvertFunction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/DerbyConcatFunction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/SQLFunctionTemplate.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/StandardJDBCEscapeFunction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/AbstractDialectResolver.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/BasicDialectResolver.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/BasicSQLExceptionConverter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectResolverSet.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ActionQueue.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Cascade.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CascadingAction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CollectionEntry.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CollectionKey.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Collections.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityEntry.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityKey.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityUniqueKey.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ExecuteUpdateResultCheckStyle.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/FilterDefinition.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/HibernateIterator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/JoinSequence.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/NamedSQLQueryDefinition.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ParameterBinder.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/PersistenceContext.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/QueryParameters.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ResultSetMappingDefinition.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/SessionFactoryImplementor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/SessionImplementor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Status.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ValueInclusion.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/VersionValue.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Versioning.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/JdbcSupportLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/StreamUtils.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/LoadContexts.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/FilterQueryPlan.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/NamedParameterDescriptor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/OrdinalParameterDescriptor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ParamLocationRecognizer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryMetadata.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ReturnMetadata.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQuerySpecification.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/transaction/IsolatedWork.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/transaction/Isolater.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/AutoFlushEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/DeleteEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/DirtyCheckEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/EventListeners.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/EvictEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/FlushEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/InitializeCollectionEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/LoadEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/LockEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/RefreshEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/ReplicateEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultLockEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultSaveEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultUpdateEventListener.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/EventCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/EvictVisitor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/ReattachVisitor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/WrapVisitor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/CacheSQLStateConverter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/Configurable.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/ConstraintViolationException.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/DataException.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/GenericJDBCException.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/JDBCConnectionException.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/JDBCExceptionHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/LockAcquisitionException.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLExceptionConverter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLGrammarException.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLStateConverter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/CollectionProperties.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/FilterTranslator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ParameterTranslations.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QuerySplitter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlLexer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlParser.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/Node.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ClauseParser.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/FromParser.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ParserHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/SelectParser.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/GUIDGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentifierGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentifierGeneratorFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentityGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IncrementGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SelectGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/TableGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/TableHiLoGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/TableStructure.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/IdentifierGeneratingInsert.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/AbstractSessionImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/FetchingScrollableResultsImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/IteratorImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SQLQueryImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/ScrollableResultsImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/AbstractFieldInterceptor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/javassist/FieldInterceptorImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/javassist/JavassistHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/BorrowedConnectionProxy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/ConnectionManager.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/Expectation.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/Expectations.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/JDBCContext.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/BasicLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/Loader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CustomLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CustomQuery.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/EntityFetchReturn.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/NonScalarReturn.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/hql/QueryLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Any.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Collection.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Join.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/PersistentClass.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Property.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/RelationalModel.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/RootClass.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/SimpleAuxiliaryDatabaseObject.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Subclass.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Table.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/metadata/ClassMetadata.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/NamedParameterSpecification.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/ParameterSpecification.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/PositionalParameterSpecification.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/VersionTypeSeedParameterSpecification.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/PersisterFactory.java 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/BasicCollectionPersister.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/EntityPersister.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/Joinable.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/pretty/Printer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/BasicPropertyAccessor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/EmbeddedPropertyAccessor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/IndexPropertyAccessor.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/PropertyAccessorFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jLazyInitializer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jProxy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jProxyFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/map/MapProxy.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/map/MapProxyFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBProxyFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCConfiguration.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCPermissions.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/CaseFragment.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/Insert.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/InsertSelect.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/Update.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/stat/StatisticsImpl.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExportTask.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/instrument/BasicInstrumentationTask.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/BTMTransactionManagerLookup.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CMTTransaction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CMTTransactionFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CacheSynchronization.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JDBCTransaction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JNDITransactionManagerLookup.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JOTMTransactionManagerLookup.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JOnASTransactionManagerLookup.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JTATransaction.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JTATransactionFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionFactoryFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionManagerLookup.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionManagerLookupFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/WebSphereTransactionManagerLookup.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/AliasToEntityMapResultTransformer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/DistinctResultTransformer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/DistinctRootEntityResultTransformer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/ToListResultTransformer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/Dom4jInstantiator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/EntityModeToTuplizerMapping.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/PojoInstantiator.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/Property.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/PropertyFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/StandardProperty.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/AbstractComponentTuplizer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentEntityModeToTuplizerMapping.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentMetamodel.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentTuplizerFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/Dom4jComponentTuplizer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/DynamicMapComponentTuplizer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/Dom4jEntityTuplizer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityEntityModeToTuplizerMapping.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityTuplizer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityTuplizerFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AbstractBynaryType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AbstractCharArrayType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AssociationType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/BlobType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ByteType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CalendarType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ClobType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CollectionType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ComponentType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CustomCollectionType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CustomType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/DbTimestampType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/EmbeddedComponentType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IdentifierBagType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IntegerType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/LongType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/NullableType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/NumericBooleanType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ShortType.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/TypeFactory.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ConfigHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ExternalSessionFactoryConfig.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/FilterHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/NamingHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/PropertiesHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SerializationHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SimpleMRUCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SoftLimitMRUCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/StringHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/XMLHelper.java core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/cache/QueryKeyTest.java core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/Mocks.java core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/TestingDialects.java core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectResolverTest.java core/branches/Branch_3_3_2_GA_CP/jdbc3-testing/src/test/java/org/hibernate/engine/jdbc/jdbc3/JdbcSupportTest.java core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/src/test/java/org/hibernate/engine/jdbc/jdbc4/JdbcSupportTest.java core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/HibernateService.java core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/StatisticsService.java core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/TestSuiteVisitor.java core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/UnitTestCase.java core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/ExecutionEnvironment.java core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestCase.java core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestClassTestSuite.java core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/tm/SimpleJtaTransactionImpl.java core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/tm/TransactionManagerLookupImpl.java core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/criteria/LikeTest.java core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/LobHolder.java core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/domain/Event.java core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/domain/Person.java core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/web/EventManagerServlet.java core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/web/SessionInterceptor.java Log: clean up unused imports Modified: core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,6 +29,7 @@ import net.sf.ehcache.CacheManager; import net.sf.ehcache.Element; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,15 +23,16 @@ */ package org.hibernate.cache; +import java.net.URL; import java.util.Properties; -import java.net.URL; import net.sf.ehcache.CacheManager; + +import org.hibernate.cfg.Environment; +import org.hibernate.util.ConfigHelper; +import org.hibernate.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.cfg.Environment; -import org.hibernate.util.StringHelper; -import org.hibernate.util.ConfigHelper; /** * Cache Provider plugin for Hibernate Modified: core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.cache; -import net.sf.ehcache.CacheManager; -import net.sf.ehcache.util.ClassLoaderUtil; - import java.net.URL; import java.util.Properties; +import java.util.logging.Level; import java.util.logging.Logger; -import java.util.logging.Level; +import net.sf.ehcache.CacheManager; +import net.sf.ehcache.util.ClassLoaderUtil; + /** * Singleton cache Provider plugin for Hibernate 3.2 and ehcache-1.2. New in this provider is support for * non Serializable keys and values. This provider works as a Singleton. No matter how many Hibernate Configurations Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/BasicRegionAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/BasicRegionAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/BasicRegionAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -44,8 +44,8 @@ import org.jboss.cache.Node; import org.jboss.cache.NodeSPI; import org.jboss.cache.config.Configuration; +import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.jboss.cache.config.Option; -import org.jboss.cache.config.Configuration.NodeLockingScheme; import org.jboss.cache.notifications.annotation.NodeInvalidated; import org.jboss.cache.notifications.annotation.NodeModified; import org.jboss.cache.notifications.annotation.ViewChanged; Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,15 @@ package org.hibernate.cache.jbc2.builder; import java.util.Properties; + import javax.transaction.TransactionManager; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.jbc2.CacheInstanceManager; +import org.hibernate.cache.jbc2.util.CacheHelper; +import org.hibernate.cfg.Settings; +import org.hibernate.transaction.TransactionManagerLookup; +import org.hibernate.util.PropertiesHelper; import org.jboss.cache.Cache; import org.jboss.cache.CacheManager; import org.jboss.cache.CacheManagerImpl; @@ -36,13 +43,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.cache.CacheException; -import org.hibernate.cache.jbc2.CacheInstanceManager; -import org.hibernate.cache.jbc2.util.CacheHelper; -import org.hibernate.cfg.Settings; -import org.hibernate.transaction.TransactionManagerLookup; -import org.hibernate.util.PropertiesHelper; - /** * Allows building separate {@link Cache} instances for each type of region, * with the expectation that a single multiplexed JGroups resource (i.e. a Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,23 +24,23 @@ package org.hibernate.cache.jbc2.builder; import java.util.Properties; + import javax.transaction.TransactionManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.jbc2.CacheInstanceManager; +import org.hibernate.cache.jbc2.util.CacheHelper; +import org.hibernate.cfg.Settings; +import org.hibernate.util.PropertiesHelper; import org.jboss.cache.Cache; import org.jboss.cache.CacheStatus; import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.config.Configuration; import org.jgroups.ChannelFactory; import org.jgroups.JChannelFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import org.hibernate.cache.CacheException; -import org.hibernate.cache.jbc2.CacheInstanceManager; -import org.hibernate.cache.jbc2.util.CacheHelper; -import org.hibernate.cfg.Settings; -import org.hibernate.util.PropertiesHelper; - /** * A {@link CacheInstanceManager} implementation where we use a single JBoss Cache * instance for each type of region. If operating on a cluster, the cache must Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/CollectionRegionImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/CollectionRegionImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/CollectionRegionImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,17 +23,16 @@ */ package org.hibernate.cache.jbc2.collection; -import org.jboss.cache.Cache; -import org.jboss.cache.Fqn; -import org.jboss.cache.config.Configuration.NodeLockingScheme; -import org.jboss.cache.notifications.annotation.CacheListener; - import org.hibernate.cache.CacheDataDescription; import org.hibernate.cache.CacheException; import org.hibernate.cache.CollectionRegion; import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter; +import org.jboss.cache.Cache; +import org.jboss.cache.Fqn; +import org.jboss.cache.config.Configuration.NodeLockingScheme; +import org.jboss.cache.notifications.annotation.CacheListener; /** * Defines the behavior of the collection cache regions for JBossCache 2.x. Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/ReadOnlyAccess.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/ReadOnlyAccess.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/collection/ReadOnlyAccess.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,12 +23,11 @@ */ package org.hibernate.cache.jbc2.collection; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.access.SoftLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.cache.access.SoftLock; -import org.hibernate.cache.CacheException; - /** * This defines the strategy for transactional access to collection data in a * pessimistic-locking JBossCache using its 2.x APIs. <p/> The read-only access Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/EntityRegionImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/EntityRegionImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/EntityRegionImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,17 +23,16 @@ */ package org.hibernate.cache.jbc2.entity; -import org.jboss.cache.Cache; -import org.jboss.cache.Fqn; -import org.jboss.cache.config.Configuration.NodeLockingScheme; -import org.jboss.cache.notifications.annotation.CacheListener; - import org.hibernate.cache.CacheDataDescription; import org.hibernate.cache.CacheException; import org.hibernate.cache.EntityRegion; import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter; +import org.jboss.cache.Cache; +import org.jboss.cache.Fqn; +import org.jboss.cache.config.Configuration.NodeLockingScheme; +import org.jboss.cache.notifications.annotation.CacheListener; /** * Defines the behavior of the entity cache regions for JBossCache. Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/OptimisticReadOnlyAccess.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/OptimisticReadOnlyAccess.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/OptimisticReadOnlyAccess.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,12 +23,11 @@ */ package org.hibernate.cache.jbc2.entity; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.access.SoftLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.cache.access.SoftLock; -import org.hibernate.cache.CacheException; - /** * This defines the strategy for read-only access to enity data in an * optimistic-locking JBossCache using its 2.x APIs <p/> The read-only access to Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/ReadOnlyAccess.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/ReadOnlyAccess.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/ReadOnlyAccess.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,12 +23,11 @@ */ package org.hibernate.cache.jbc2.entity; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.access.SoftLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.cache.access.SoftLock; -import org.hibernate.cache.CacheException; - /** * This defines the strategy for transactional access to enity data in * JBossCache using its 2.x APIs <p/> read-only access to a JBossCache really is Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/TransactionalAccess.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/TransactionalAccess.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/entity/TransactionalAccess.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.cache.jbc2.entity; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.EntityRegion; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.access.SoftLock; import org.hibernate.cache.jbc2.access.TransactionalAccessDelegate; -import org.hibernate.cache.EntityRegion; -import org.hibernate.cache.CacheException; /** * Defines the strategy for transactional access to entity data in a Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractCollectionRegionAccessStrategyTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractCollectionRegionAccessStrategyTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractCollectionRegionAccessStrategyTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,7 +23,6 @@ */ package org.hibernate.test.cache.jbc2.collection; -import java.util.Iterator; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -33,7 +32,6 @@ import junit.framework.TestSuite; import org.hibernate.cache.CacheDataDescription; -import org.hibernate.cache.CacheException; import org.hibernate.cache.CollectionRegion; import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.CollectionRegionAccessStrategy; Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticInvalidatedTransactionalTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticInvalidatedTransactionalTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticInvalidatedTransactionalTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.test.cache.jbc2.collection; -import org.hibernate.test.util.CacheTestUtil; - import junit.framework.Test; import junit.framework.TestSuite; +import org.hibernate.test.util.CacheTestUtil; + /** * Tests TRANSACTIONAL access when optimistic locking and invalidation are used. * Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReadOnlyTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReadOnlyTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReadOnlyTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.test.cache.jbc2.collection; -import org.hibernate.test.util.CacheTestUtil; - import junit.framework.Test; import junit.framework.TestSuite; +import org.hibernate.test.util.CacheTestUtil; + /** * Tests READ_ONLY access when optimistic locking and invalidation are used. * Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticInvalidatedTransactionalTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticInvalidatedTransactionalTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticInvalidatedTransactionalTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.test.cache.jbc2.collection; -import org.hibernate.test.util.CacheTestUtil; - import junit.framework.Test; import junit.framework.TestSuite; +import org.hibernate.test.util.CacheTestUtil; + /** * Tests TRANSACTIONAL access when pessimistic locking and invalidation are used. * Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticReadOnlyTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticReadOnlyTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticReadOnlyTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.test.cache.jbc2.collection; -import org.hibernate.test.util.CacheTestUtil; - import junit.framework.Test; import junit.framework.TestSuite; +import org.hibernate.test.util.CacheTestUtil; + /** * Tests READ_ONLY access when pessimistic locking and invalidation are used. * Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractEntityRegionAccessStrategyTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractEntityRegionAccessStrategyTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractEntityRegionAccessStrategyTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,7 +23,6 @@ */ package org.hibernate.test.cache.jbc2.entity; -import java.util.Iterator; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticInvalidatedTransactionalTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticInvalidatedTransactionalTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticInvalidatedTransactionalTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.test.cache.jbc2.entity; -import org.hibernate.test.util.CacheTestUtil; - import junit.framework.Test; import junit.framework.TestSuite; +import org.hibernate.test.util.CacheTestUtil; + /** * Tests TRANSACTIONAL access when optimistic locking and invalidation are used. * Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReadOnlyTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReadOnlyTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReadOnlyTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.test.cache.jbc2.entity; -import org.hibernate.test.util.CacheTestUtil; - import junit.framework.Test; import junit.framework.TestSuite; +import org.hibernate.test.util.CacheTestUtil; + /** * Tests READ_ONLY access when optimistic locking and invalidation are used. * Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticInvalidatedTransactionalTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticInvalidatedTransactionalTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticInvalidatedTransactionalTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.test.cache.jbc2.entity; -import org.hibernate.test.util.CacheTestUtil; - import junit.framework.Test; import junit.framework.TestSuite; +import org.hibernate.test.util.CacheTestUtil; + /** * Tests TRANSACTIONAL access when pessimistic locking and invalidation are used. * Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticReadOnlyTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticReadOnlyTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticReadOnlyTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.test.cache.jbc2.entity; -import org.hibernate.test.util.CacheTestUtil; - import junit.framework.Test; import junit.framework.TestSuite; +import org.hibernate.test.util.CacheTestUtil; + /** * Tests READ_ONLY access when pessimistic locking and invalidation are used. * Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,7 +23,6 @@ */ package org.hibernate.test.cache.jbc2.functional; -import org.hibernate.cache.RegionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Mappings; Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticEntityReplicationTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticEntityReplicationTest.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticEntityReplicationTest.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,14 +31,11 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.cache.RegionFactory; import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil; import org.hibernate.test.cache.jbc2.functional.util.TestCacheInstanceManager; import org.hibernate.test.cache.jbc2.functional.util.TestJBossCacheRegionFactory; -import org.hibernate.transaction.CMTTransactionFactory; import org.jboss.cache.Cache; import org.jboss.cache.CacheManager; import org.jboss.cache.Fqn; Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,7 +24,6 @@ import junit.framework.Test; -import org.hibernate.test.cache.jbc2.collection.OptimisticInvalidatedTransactionalTestCase; import org.hibernate.test.util.CacheTestUtil; Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,12 @@ package org.hibernate.test.cache.jbc2.functional.util; import java.util.Properties; + +import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import javax.transaction.Transaction; +import org.hibernate.HibernateException; import org.hibernate.transaction.TransactionManagerLookup; -import org.hibernate.HibernateException; /** * SimpleJtaTransactionManagerLookupImpl subclass that finds a different Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,8 +25,8 @@ import java.util.Properties; +import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import javax.transaction.Transaction; import org.hibernate.HibernateException; import org.hibernate.transaction.TransactionManagerLookup; Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/util/CacheTestSupport.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/util/CacheTestSupport.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/java/org/hibernate/test/util/CacheTestSupport.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,11 +27,10 @@ import java.util.Iterator; import java.util.Set; +import org.hibernate.cache.RegionFactory; import org.jboss.cache.Cache; import org.slf4j.Logger; -import org.hibernate.cache.RegionFactory; - /** * Support class for tracking and cleaning up objects used in tests. * Modified: core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/src/main/java/org/hibernate/cache/SwarmCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/src/main/java/org/hibernate/cache/SwarmCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/src/main/java/org/hibernate/cache/SwarmCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.cache; -import net.sf.swarmcache.ObjectCache; - import java.io.Serializable; import java.util.Map; +import net.sf.swarmcache.ObjectCache; + /** * @author Jason Carreira, Gavin King */ Modified: core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/src/main/java/org/hibernate/cache/SwarmCacheProvider.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/src/main/java/org/hibernate/cache/SwarmCacheProvider.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/cache-swarmcache/src/main/java/org/hibernate/cache/SwarmCacheProvider.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,13 +23,13 @@ */ package org.hibernate.cache; +import java.util.Properties; + import net.sf.swarmcache.CacheConfiguration; import net.sf.swarmcache.CacheConfigurationManager; import net.sf.swarmcache.CacheFactory; import net.sf.swarmcache.ObjectCache; -import java.util.Properties; - /** * Support for SwarmCache replicated cache. SwarmCache does not support * locking, so strict "read-write" semantics are unsupported. Modified: core/branches/Branch_3_3_2_GA_CP/connection-c3p0/src/main/java/org/hibernate/connection/C3P0ConnectionProvider.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/connection-c3p0/src/main/java/org/hibernate/connection/C3P0ConnectionProvider.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/connection-c3p0/src/main/java/org/hibernate/connection/C3P0ConnectionProvider.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,16 +30,15 @@ import javax.sql.DataSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.mchange.v2.c3p0.DataSources; - import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.util.PropertiesHelper; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.mchange.v2.c3p0.DataSources; + /** * A connection provider that uses a C3P0 connection pool. Hibernate will use this by * default if the <tt>hibernate.c3p0.*</tt> properties are set. Modified: core/branches/Branch_3_3_2_GA_CP/connection-proxool/src/main/java/org/hibernate/connection/ProxoolConnectionProvider.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/connection-proxool/src/main/java/org/hibernate/connection/ProxoolConnectionProvider.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/connection-proxool/src/main/java/org/hibernate/connection/ProxoolConnectionProvider.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,17 +30,15 @@ import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; +import org.hibernate.util.ConfigHelper; import org.hibernate.util.PropertiesHelper; import org.hibernate.util.StringHelper; -import org.hibernate.util.ConfigHelper; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.logicalcobwebs.proxool.ProxoolException; import org.logicalcobwebs.proxool.ProxoolFacade; import org.logicalcobwebs.proxool.configuration.JAXPConfigurator; import org.logicalcobwebs.proxool.configuration.PropertyConfigurator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A connection provider that uses a Proxool connection pool. Hibernate will use this by Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/EntityMode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/EntityMode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/EntityMode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate; +import java.io.Serializable; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; -import java.io.Serializable; /** * Defines the representation modes available for entities. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Filter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Filter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Filter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate; +import java.util.Collection; + import org.hibernate.engine.FilterDefinition; -import java.util.Collection; - /** * Type definition of Filter. Filter defines the user's view into enabled dynamic filters, * allowing them to set filter parameter values. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Hibernate.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Hibernate.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/Hibernate.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.Reader; import java.io.Serializable; -import java.io.ByteArrayOutputStream; import java.sql.Blob; import java.sql.Clob; import java.util.Iterator; @@ -37,9 +37,9 @@ import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.HibernateIterator; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.jdbc.NonContextualLobCreator; import org.hibernate.engine.jdbc.LobCreationContext; import org.hibernate.engine.jdbc.LobCreator; +import org.hibernate.engine.jdbc.NonContextualLobCreator; import org.hibernate.engine.jdbc.StreamUtils; import org.hibernate.intercept.FieldInterceptionHelper; import org.hibernate.intercept.FieldInterceptor; @@ -54,6 +54,8 @@ import org.hibernate.type.ByteType; import org.hibernate.type.CalendarDateType; import org.hibernate.type.CalendarType; +import org.hibernate.type.CharArrayType; +import org.hibernate.type.CharacterArrayType; import org.hibernate.type.CharacterType; import org.hibernate.type.ClassType; import org.hibernate.type.ClobType; @@ -77,10 +79,8 @@ import org.hibernate.type.TimestampType; import org.hibernate.type.TrueFalseType; import org.hibernate.type.Type; +import org.hibernate.type.WrapperBinaryType; import org.hibernate.type.YesNoType; -import org.hibernate.type.CharArrayType; -import org.hibernate.type.WrapperBinaryType; -import org.hibernate.type.CharacterArrayType; import org.hibernate.usertype.CompositeUserType; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/SessionFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/SessionFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/SessionFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,10 +31,10 @@ import javax.naming.Referenceable; +import org.hibernate.engine.FilterDefinition; import org.hibernate.metadata.ClassMetadata; import org.hibernate.metadata.CollectionMetadata; import org.hibernate.stat.Statistics; -import org.hibernate.engine.FilterDefinition; /** * Creates <tt>Session</tt>s. Usually an application has a single <tt>SessionFactory</tt>. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,19 +24,19 @@ */ package org.hibernate.action; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + import org.hibernate.HibernateException; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.Queryable; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.engine.SessionImplementor; -import java.io.Serializable; -import java.util.Map; -import java.util.Set; -import java.util.Iterator; -import java.util.HashSet; -import java.util.ArrayList; - /** * Implementation of BulkOperationCleanupAction. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,19 +24,19 @@ */ package org.hibernate.action; -import org.hibernate.cache.access.SoftLock; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.Serializable; + import org.hibernate.cache.CacheException; import org.hibernate.cache.CacheKey; +import org.hibernate.cache.access.SoftLock; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.util.StringHelper; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.Serializable; - /** * Any action relating to insert/update/delete of a collection * @author Gavin King Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionRecreateAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionRecreateAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionRecreateAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,19 +24,19 @@ */ package org.hibernate.action; +import java.io.Serializable; + import org.hibernate.HibernateException; +import org.hibernate.cache.CacheException; +import org.hibernate.collection.PersistentCollection; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.event.EventSource; +import org.hibernate.event.PostCollectionRecreateEvent; import org.hibernate.event.PostCollectionRecreateEventListener; -import org.hibernate.event.PostCollectionRecreateEvent; -import org.hibernate.event.EventSource; import org.hibernate.event.PreCollectionRecreateEvent; import org.hibernate.event.PreCollectionRecreateEventListener; -import org.hibernate.cache.CacheException; -import org.hibernate.collection.PersistentCollection; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.collection.CollectionPersister; -import java.io.Serializable; - public final class CollectionRecreateAction extends CollectionAction { public CollectionRecreateAction( Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionRemoveAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionRemoveAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionRemoveAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,20 +24,20 @@ */ package org.hibernate.action; +import java.io.Serializable; + +import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.AssertionFailure; +import org.hibernate.cache.CacheException; +import org.hibernate.collection.PersistentCollection; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.event.EventSource; import org.hibernate.event.PostCollectionRemoveEvent; +import org.hibernate.event.PostCollectionRemoveEventListener; import org.hibernate.event.PreCollectionRemoveEvent; import org.hibernate.event.PreCollectionRemoveEventListener; -import org.hibernate.event.EventSource; -import org.hibernate.event.PostCollectionRemoveEventListener; -import org.hibernate.cache.CacheException; -import org.hibernate.collection.PersistentCollection; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.collection.CollectionPersister; -import java.io.Serializable; - public final class CollectionRemoveAction extends CollectionAction { private boolean emptySnapshot; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionUpdateAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionUpdateAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/CollectionUpdateAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,21 +24,21 @@ */ package org.hibernate.action; +import java.io.Serializable; + import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; +import org.hibernate.cache.CacheException; +import org.hibernate.collection.PersistentCollection; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.event.EventSource; import org.hibernate.event.PostCollectionUpdateEvent; +import org.hibernate.event.PostCollectionUpdateEventListener; import org.hibernate.event.PreCollectionUpdateEvent; import org.hibernate.event.PreCollectionUpdateEventListener; -import org.hibernate.event.EventSource; -import org.hibernate.event.PostCollectionUpdateEventListener; -import org.hibernate.cache.CacheException; -import org.hibernate.collection.PersistentCollection; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; -import java.io.Serializable; - public final class CollectionUpdateAction extends CollectionAction { private final boolean emptySnapshot; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,16 @@ */ package org.hibernate.action; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.Serializable; + import org.hibernate.AssertionFailure; import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.util.StringHelper; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.Serializable; - /** * Base class for actions relating to insert/update/delete of an entity * instance. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityDeleteAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityDeleteAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityDeleteAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,14 +31,13 @@ import org.hibernate.cache.CacheKey; import org.hibernate.cache.access.SoftLock; import org.hibernate.engine.EntityEntry; -import org.hibernate.engine.EntityKey; import org.hibernate.engine.PersistenceContext; import org.hibernate.engine.SessionImplementor; +import org.hibernate.event.EventSource; import org.hibernate.event.PostDeleteEvent; import org.hibernate.event.PostDeleteEventListener; import org.hibernate.event.PreDeleteEvent; import org.hibernate.event.PreDeleteEventListener; -import org.hibernate.event.EventSource; import org.hibernate.persister.entity.EntityPersister; public final class EntityDeleteAction extends EntityAction { Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,15 +26,15 @@ import java.io.Serializable; +import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.AssertionFailure; +import org.hibernate.engine.EntityKey; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.EntityKey; +import org.hibernate.event.EventSource; import org.hibernate.event.PostInsertEvent; import org.hibernate.event.PostInsertEventListener; import org.hibernate.event.PreInsertEvent; import org.hibernate.event.PreInsertEventListener; -import org.hibernate.event.EventSource; import org.hibernate.persister.entity.EntityPersister; public final class EntityIdentityInsertAction extends EntityAction { Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityInsertAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityInsertAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityInsertAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -34,11 +34,11 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.Versioning; +import org.hibernate.event.EventSource; import org.hibernate.event.PostInsertEvent; import org.hibernate.event.PostInsertEventListener; import org.hibernate.event.PreInsertEvent; import org.hibernate.event.PreInsertEventListener; -import org.hibernate.event.EventSource; import org.hibernate.persister.entity.EntityPersister; public final class EntityInsertAction extends EntityAction { Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityUpdateAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityUpdateAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/EntityUpdateAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -37,11 +37,11 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.Status; import org.hibernate.engine.Versioning; +import org.hibernate.event.EventSource; import org.hibernate.event.PostUpdateEvent; import org.hibernate.event.PostUpdateEventListener; import org.hibernate.event.PreUpdateEvent; import org.hibernate.event.PreUpdateEventListener; -import org.hibernate.event.EventSource; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.TypeFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/Executable.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/Executable.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/action/Executable.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.action; +import java.io.Serializable; + import org.hibernate.HibernateException; -import java.io.Serializable; - /** * An operation which may be scheduled for later execution. * Usually, the operation is a database insert/update/delete, Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/AbstractClassTransformerImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/AbstractClassTransformerImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/AbstractClassTransformerImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.bytecode; +import java.security.ProtectionDomain; + import org.hibernate.bytecode.util.ClassFilter; import org.hibernate.bytecode.util.FieldFilter; -import java.security.ProtectionDomain; - /** * Basic implementation of the {@link ClassTransformer} contract. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/InstrumentedClassLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/InstrumentedClassLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/InstrumentedClassLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.bytecode; +import java.io.InputStream; + import org.hibernate.bytecode.util.ByteCodeHelper; -import java.io.InputStream; - /** * A specialized classloader which performs bytecode enhancement on class * definitions as they are loaded into the classloader scope. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,25 +23,25 @@ */ package org.hibernate.bytecode.buildtime; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import java.util.HashSet; +import java.util.zip.CRC32; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; -import java.util.zip.CRC32; -import java.io.File; -import java.io.DataInputStream; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.FileInputStream; -import java.io.OutputStream; -import java.io.FileOutputStream; +import org.hibernate.bytecode.ClassTransformer; import org.hibernate.bytecode.util.ByteCodeHelper; import org.hibernate.bytecode.util.ClassDescriptor; import org.hibernate.bytecode.util.FieldFilter; -import org.hibernate.bytecode.ClassTransformer; /** * Provides the basic templating of how instrumentation should occur. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,16 +23,17 @@ */ package org.hibernate.bytecode.buildtime; +import java.io.ByteArrayInputStream; import java.util.Set; -import java.io.ByteArrayInputStream; -import org.hibernate.bytecode.util.ClassDescriptor; -import org.hibernate.bytecode.util.BasicClassFilter; +import net.sf.cglib.core.ClassNameReader; +import net.sf.cglib.transform.impl.InterceptFieldEnabled; + import org.hibernate.bytecode.ClassTransformer; import org.hibernate.bytecode.cglib.BytecodeProviderImpl; +import org.hibernate.bytecode.util.BasicClassFilter; +import org.hibernate.bytecode.util.ClassDescriptor; import org.objectweb.asm.ClassReader; -import net.sf.cglib.core.ClassNameReader; -import net.sf.cglib.transform.impl.InterceptFieldEnabled; /** * Strategy for performing build-time instrumentation of persistent classes in order to enable Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/JavassistInstrumenter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/JavassistInstrumenter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/buildtime/JavassistInstrumenter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,18 +23,18 @@ */ package org.hibernate.bytecode.buildtime; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.IOException; import java.util.Set; -import java.io.IOException; -import java.io.DataInputStream; -import java.io.ByteArrayInputStream; import javassist.bytecode.ClassFile; -import org.hibernate.bytecode.util.ClassDescriptor; -import org.hibernate.bytecode.util.BasicClassFilter; import org.hibernate.bytecode.ClassTransformer; import org.hibernate.bytecode.javassist.BytecodeProviderImpl; import org.hibernate.bytecode.javassist.FieldHandled; +import org.hibernate.bytecode.util.BasicClassFilter; +import org.hibernate.bytecode.util.ClassDescriptor; /** * Strategy for performing build-time instrumentation of persistent classes in order to enable Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,15 +24,16 @@ */ package org.hibernate.bytecode.cglib; -import org.hibernate.bytecode.ReflectionOptimizer; -import org.hibernate.PropertyAccessException; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + import net.sf.cglib.beans.BulkBean; import net.sf.cglib.beans.BulkBeanException; -import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; +import org.hibernate.PropertyAccessException; +import org.hibernate.bytecode.ReflectionOptimizer; /** * The {@link ReflectionOptimizer.AccessOptimizer} implementation for CGLIB Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,13 +29,14 @@ import net.sf.cglib.beans.BulkBean; import net.sf.cglib.beans.BulkBeanException; import net.sf.cglib.reflect.FastClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.hibernate.bytecode.BytecodeProvider; import org.hibernate.bytecode.ProxyFactoryFactory; import org.hibernate.bytecode.ReflectionOptimizer; import org.hibernate.bytecode.util.FieldFilter; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Bytecode provider implementation for CGLIB. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,28 +24,29 @@ */ package org.hibernate.bytecode.cglib; -import java.security.ProtectionDomain; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.ByteArrayOutputStream; +import java.security.ProtectionDomain; +import net.sf.cglib.core.ClassNameReader; +import net.sf.cglib.core.DebuggingClassWriter; +import net.sf.cglib.transform.ClassReaderGenerator; import net.sf.cglib.transform.ClassTransformer; import net.sf.cglib.transform.TransformingClassGenerator; -import net.sf.cglib.transform.ClassReaderGenerator; import net.sf.cglib.transform.impl.InterceptFieldEnabled; import net.sf.cglib.transform.impl.InterceptFieldFilter; import net.sf.cglib.transform.impl.InterceptFieldTransformer; -import net.sf.cglib.core.ClassNameReader; -import net.sf.cglib.core.DebuggingClassWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import org.hibernate.HibernateException; import org.hibernate.bytecode.AbstractClassTransformerImpl; +import org.hibernate.bytecode.util.ClassFilter; import org.hibernate.bytecode.util.FieldFilter; -import org.hibernate.bytecode.util.ClassFilter; -import org.hibernate.HibernateException; -import org.objectweb.asm.Type; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Enhance the classes allowing them to implements InterceptFieldEnabled Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,15 +24,16 @@ */ package org.hibernate.bytecode.cglib; -import org.hibernate.bytecode.ReflectionOptimizer; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + import net.sf.cglib.reflect.FastClass; + import org.hibernate.InstantiationException; +import org.hibernate.bytecode.ReflectionOptimizer; -import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; - /** * The {@link ReflectionOptimizer.InstantiationOptimizer} implementation for CGLIB * which simply acts as an adpater to the {@link FastClass} class. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,22 +24,23 @@ */ package org.hibernate.bytecode.cglib; -import org.hibernate.bytecode.ProxyFactoryFactory; -import org.hibernate.bytecode.BasicProxyFactory; -import org.hibernate.proxy.ProxyFactory; -import org.hibernate.proxy.pojo.cglib.CGLIBProxyFactory; -import org.hibernate.AssertionFailure; -import org.hibernate.HibernateException; +import java.lang.reflect.Method; +import java.util.HashMap; + +import net.sf.cglib.proxy.Callback; +import net.sf.cglib.proxy.CallbackFilter; import net.sf.cglib.proxy.Enhancer; -import net.sf.cglib.proxy.CallbackFilter; +import net.sf.cglib.proxy.Factory; import net.sf.cglib.proxy.MethodInterceptor; import net.sf.cglib.proxy.MethodProxy; import net.sf.cglib.proxy.NoOp; -import net.sf.cglib.proxy.Callback; -import net.sf.cglib.proxy.Factory; -import java.lang.reflect.Method; -import java.util.HashMap; +import org.hibernate.AssertionFailure; +import org.hibernate.HibernateException; +import org.hibernate.bytecode.BasicProxyFactory; +import org.hibernate.bytecode.ProxyFactoryFactory; +import org.hibernate.proxy.ProxyFactory; +import org.hibernate.proxy.pojo.cglib.CGLIBProxyFactory; /** * A factory for CGLIB-based {@link ProxyFactory} instances. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.bytecode.cglib; +import java.io.Serializable; + import org.hibernate.bytecode.ReflectionOptimizer; -import java.io.Serializable; - /** * ReflectionOptimizer implementation for CGLIB. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.bytecode.javassist; +import java.io.Serializable; + +import org.hibernate.PropertyAccessException; import org.hibernate.bytecode.ReflectionOptimizer; -import org.hibernate.PropertyAccessException; -import java.io.Serializable; - /** * The {@link ReflectionOptimizer.AccessOptimizer} implementation for Javassist * which simply acts as an adpater to the {@link BulkAccessor} class. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,6 @@ import java.lang.reflect.Modifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.bytecode.BytecodeProvider; import org.hibernate.bytecode.ClassTransformer; import org.hibernate.bytecode.ProxyFactoryFactory; @@ -35,6 +33,8 @@ import org.hibernate.bytecode.util.ClassFilter; import org.hibernate.bytecode.util.FieldFilter; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Bytecode provider implementation for Javassist. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/FastClass.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/FastClass.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/FastClass.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.bytecode.javassist; +import java.io.Serializable; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.io.Serializable; /** * @author Muga Nishizawa Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.bytecode.javassist; +import java.io.Serializable; + +import org.hibernate.InstantiationException; import org.hibernate.bytecode.ReflectionOptimizer; -import org.hibernate.InstantiationException; -import java.io.Serializable; - /** * The {@link ReflectionOptimizer.InstantiationOptimizer} implementation for Javassist * which simply acts as an adpater to the {@link FastClass} class. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,11 +32,12 @@ import java.security.ProtectionDomain; import javassist.bytecode.ClassFile; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.hibernate.HibernateException; import org.hibernate.bytecode.AbstractClassTransformerImpl; import org.hibernate.bytecode.util.ClassFilter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Enhance the classes allowing them to implements InterceptFieldEnabled Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/ProxyFactoryFactoryImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/ProxyFactoryFactoryImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/ProxyFactoryFactoryImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,19 +24,20 @@ */ package org.hibernate.bytecode.javassist; +import java.lang.reflect.Method; +import java.util.HashMap; + +import javassist.util.proxy.MethodFilter; +import javassist.util.proxy.MethodHandler; +import javassist.util.proxy.ProxyObject; + +import org.hibernate.AssertionFailure; +import org.hibernate.HibernateException; +import org.hibernate.bytecode.BasicProxyFactory; import org.hibernate.bytecode.ProxyFactoryFactory; -import org.hibernate.bytecode.BasicProxyFactory; import org.hibernate.proxy.ProxyFactory; import org.hibernate.proxy.pojo.javassist.JavassistProxyFactory; -import org.hibernate.AssertionFailure; -import org.hibernate.HibernateException; -import javassist.util.proxy.MethodFilter; -import javassist.util.proxy.ProxyObject; -import javassist.util.proxy.MethodHandler; -import java.lang.reflect.Method; -import java.util.HashMap; - /** * A factory for Javassist-based {@link ProxyFactory} instances. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/ReflectionOptimizerImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/ReflectionOptimizerImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/ReflectionOptimizerImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.bytecode.javassist; +import java.io.Serializable; + import org.hibernate.bytecode.ReflectionOptimizer; -import java.io.Serializable; - /** * ReflectionOptimizer implementation for Javassist. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/TransformingClassLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/TransformingClassLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/javassist/TransformingClassLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,15 @@ */ package org.hibernate.bytecode.javassist; +import java.io.IOException; + +import javassist.CannotCompileException; import javassist.ClassPool; +import javassist.CtClass; import javassist.NotFoundException; -import javassist.CtClass; -import javassist.CannotCompileException; + import org.hibernate.HibernateException; -import java.io.IOException; - /** * @author Steve Ebersole */ Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.bytecode.util; +import java.util.HashSet; import java.util.Set; -import java.util.HashSet; /** * BasicClassFilter provides class filtering based on a series of packages to Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/ByteCodeHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/ByteCodeHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/bytecode/util/ByteCodeHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.bytecode.util; -import java.io.InputStream; -import java.io.IOException; +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; -import java.io.ByteArrayOutputStream; -import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; import java.util.zip.ZipInputStream; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,11 +30,11 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.cfg.Environment; import org.hibernate.util.NamingHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Support for CacheProvider implementations which are backed by caches bound Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/CollectionRegion.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/CollectionRegion.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/CollectionRegion.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.cache; +import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.CollectionRegionAccessStrategy; -import org.hibernate.cache.access.AccessType; /** * Defines the contract for a cache region which will specifically be used to Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/EntityRegion.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/EntityRegion.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/EntityRegion.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.cache; +import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.EntityRegionAccessStrategy; -import org.hibernate.cache.access.AccessType; /** * Defines the contract for a cache region which will specifically be used to Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/HashtableCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/HashtableCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/HashtableCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,7 +26,6 @@ import java.util.Collections; import java.util.Hashtable; - import java.util.Map; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,11 +26,10 @@ import java.util.Comparator; +import org.hibernate.cache.access.SoftLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.cache.access.SoftLock; - /** * Caches data that is sometimes updated without ever locking the cache. * If concurrent access to an item is possible, this concurrency strategy Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/QueryCacheFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/QueryCacheFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/QueryCacheFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.cache; +import java.util.Properties; + import org.hibernate.HibernateException; import org.hibernate.cfg.Settings; -import java.util.Properties; - /** * Defines a factory for query cache instances. These factories are responsible for * creating individual QueryCache instances. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/QueryKey.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/QueryKey.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/QueryKey.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,11 +23,11 @@ */ package org.hibernate.cache; +import java.io.IOException; import java.io.Serializable; -import java.io.IOException; +import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.Iterator; import org.hibernate.EntityMode; import org.hibernate.engine.QueryParameters; @@ -36,8 +36,8 @@ import org.hibernate.engine.TypedValue; import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; +import org.hibernate.util.CollectionHelper; import org.hibernate.util.EqualsHelper; -import org.hibernate.util.CollectionHelper; /** * A key that identifies a particular query with bound parameter values. This is the object Hibernate uses Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/ReadOnlyCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/ReadOnlyCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/ReadOnlyCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,11 +26,10 @@ import java.util.Comparator; +import org.hibernate.cache.access.SoftLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.cache.access.SoftLock; - /** * Caches data that is never updated. * @see CacheConcurrencyStrategy Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/ReadWriteCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/ReadWriteCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/ReadWriteCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,11 +27,10 @@ import java.io.Serializable; import java.util.Comparator; +import org.hibernate.cache.access.SoftLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.cache.access.SoftLock; - /** * Caches data that is sometimes updated while maintaining the semantics of * "read committed" isolation level. If the database is set to "repeatable Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/StandardQueryCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/StandardQueryCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/StandardQueryCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,15 +30,14 @@ import java.util.Properties; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.UnresolvableObjectException; import org.hibernate.cfg.Settings; import org.hibernate.engine.SessionImplementor; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The standard implementation of the Hibernate QueryCache interface. This Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/StandardQueryCacheFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/StandardQueryCacheFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/StandardQueryCacheFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.cache; +import java.util.Properties; + import org.hibernate.HibernateException; import org.hibernate.cfg.Settings; -import java.util.Properties; - /** * Standard Hibernate implementation of the QueryCacheFactory interface. Returns * instances of {@link StandardQueryCache}. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/TransactionalCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/TransactionalCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/TransactionalCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,11 +26,10 @@ import java.util.Comparator; +import org.hibernate.cache.access.SoftLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.cache.access.SoftLock; - /** * Support for fully transactional cache implementations like * JBoss TreeCache. Note that this might be a less scalable Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,12 +29,11 @@ import java.util.Properties; import java.util.Set; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Settings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.HibernateException; -import org.hibernate.cfg.Settings; - /** * Tracks the timestamps of the most recent updates to particular tables. It is * important that the cache timeout of the underlying cache implementation be set Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/access/EntityRegionAccessStrategy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/access/EntityRegionAccessStrategy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/access/EntityRegionAccessStrategy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.cache.access; +import org.hibernate.cache.CacheException; import org.hibernate.cache.EntityRegion; -import org.hibernate.cache.CacheException; /** * Contract for managing transactional and concurrent access to cached entity Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/CacheDataDescriptionImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/CacheDataDescriptionImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/CacheDataDescriptionImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,8 +27,8 @@ import java.util.Comparator; import org.hibernate.cache.CacheDataDescription; +import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.Collection; import org.hibernate.type.VersionType; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/NoCachingRegionFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/NoCachingRegionFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/NoCachingRegionFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,14 +26,14 @@ import java.util.Properties; -import org.hibernate.cache.RegionFactory; +import org.hibernate.cache.CacheDataDescription; import org.hibernate.cache.CacheException; +import org.hibernate.cache.CollectionRegion; import org.hibernate.cache.EntityRegion; -import org.hibernate.cache.CollectionRegion; +import org.hibernate.cache.NoCachingEnabledException; import org.hibernate.cache.QueryResultsRegion; +import org.hibernate.cache.RegionFactory; import org.hibernate.cache.TimestampsRegion; -import org.hibernate.cache.NoCachingEnabledException; -import org.hibernate.cache.CacheDataDescription; import org.hibernate.cfg.Settings; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseGeneralDataRegionAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseGeneralDataRegionAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseGeneralDataRegionAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.cache.impl.bridge; -import org.hibernate.cache.GeneralDataRegion; import org.hibernate.cache.Cache; import org.hibernate.cache.CacheException; +import org.hibernate.cache.GeneralDataRegion; import org.hibernate.cfg.Settings; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,9 +26,9 @@ import java.util.Map; -import org.hibernate.cache.Region; import org.hibernate.cache.Cache; import org.hibernate.cache.CacheException; +import org.hibernate.cache.Region; import org.hibernate.cfg.Settings; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseTransactionalDataRegionAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseTransactionalDataRegionAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/BaseTransactionalDataRegionAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.cache.impl.bridge; -import org.hibernate.cache.TransactionalDataRegion; import org.hibernate.cache.Cache; import org.hibernate.cache.CacheDataDescription; +import org.hibernate.cache.TransactionalDataRegion; import org.hibernate.cfg.Settings; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionAccessStrategyAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionAccessStrategyAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionAccessStrategyAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.cache.impl.bridge; +import org.hibernate.cache.CacheConcurrencyStrategy; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.CollectionRegion; import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cache.access.SoftLock; -import org.hibernate.cache.CacheConcurrencyStrategy; -import org.hibernate.cache.CollectionRegion; -import org.hibernate.cache.CacheException; import org.hibernate.cfg.Settings; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,22 +24,21 @@ */ package org.hibernate.cache.impl.bridge; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.hibernate.cache.CollectionRegion; import org.hibernate.cache.Cache; +import org.hibernate.cache.CacheConcurrencyStrategy; import org.hibernate.cache.CacheDataDescription; -import org.hibernate.cache.OptimisticCache; import org.hibernate.cache.CacheException; -import org.hibernate.cache.CacheConcurrencyStrategy; -import org.hibernate.cache.TransactionalCache; -import org.hibernate.cache.ReadWriteCache; +import org.hibernate.cache.CollectionRegion; import org.hibernate.cache.NonstrictReadWriteCache; +import org.hibernate.cache.OptimisticCache; import org.hibernate.cache.ReadOnlyCache; -import org.hibernate.cache.access.CollectionRegionAccessStrategy; +import org.hibernate.cache.ReadWriteCache; +import org.hibernate.cache.TransactionalCache; import org.hibernate.cache.access.AccessType; +import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cfg.Settings; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Adapter specifically bridging {@link CollectionRegion} to {@link Cache}. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/EntityAccessStrategyAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/EntityAccessStrategyAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/EntityAccessStrategyAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,8 +25,8 @@ package org.hibernate.cache.impl.bridge; import org.hibernate.cache.CacheConcurrencyStrategy; +import org.hibernate.cache.CacheException; import org.hibernate.cache.EntityRegion; -import org.hibernate.cache.CacheException; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.access.SoftLock; import org.hibernate.cfg.Settings; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,22 +24,21 @@ */ package org.hibernate.cache.impl.bridge; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.hibernate.cache.EntityRegion; import org.hibernate.cache.Cache; +import org.hibernate.cache.CacheConcurrencyStrategy; import org.hibernate.cache.CacheDataDescription; -import org.hibernate.cache.OptimisticCache; import org.hibernate.cache.CacheException; -import org.hibernate.cache.CacheConcurrencyStrategy; +import org.hibernate.cache.EntityRegion; +import org.hibernate.cache.NonstrictReadWriteCache; +import org.hibernate.cache.OptimisticCache; import org.hibernate.cache.ReadOnlyCache; import org.hibernate.cache.ReadWriteCache; -import org.hibernate.cache.NonstrictReadWriteCache; import org.hibernate.cache.TransactionalCache; -import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.access.AccessType; +import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cfg.Settings; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Adapter specifically bridging {@link EntityRegion} to {@link Cache}. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/OptimisticCacheSourceAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/OptimisticCacheSourceAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/OptimisticCacheSourceAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,8 @@ import java.util.Comparator; +import org.hibernate.cache.CacheDataDescription; import org.hibernate.cache.OptimisticCacheSource; -import org.hibernate.cache.CacheDataDescription; /** * {@inheritDoc} Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/QueryResultsRegionAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/QueryResultsRegionAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/QueryResultsRegionAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.cache.impl.bridge; +import org.hibernate.cache.Cache; import org.hibernate.cache.QueryResultsRegion; -import org.hibernate.cache.Cache; import org.hibernate.cfg.Settings; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,22 +26,21 @@ import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.hibernate.cache.RegionFactory; -import org.hibernate.cache.CacheProvider; +import org.hibernate.cache.CacheDataDescription; import org.hibernate.cache.CacheException; -import org.hibernate.cache.EntityRegion; +import org.hibernate.cache.CacheProvider; import org.hibernate.cache.CollectionRegion; -import org.hibernate.cache.QueryResultsRegion; +import org.hibernate.cache.EntityRegion; import org.hibernate.cache.NoCacheProvider; +import org.hibernate.cache.QueryResultsRegion; +import org.hibernate.cache.RegionFactory; import org.hibernate.cache.TimestampsRegion; -import org.hibernate.cache.CacheDataDescription; -import org.hibernate.util.PropertiesHelper; -import org.hibernate.util.ReflectHelper; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Settings; +import org.hibernate.util.PropertiesHelper; +import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Acts as a bridge between the {@link RegionFactory} contract and the older Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/TimestampsRegionAdapter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/TimestampsRegionAdapter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cache/impl/bridge/TimestampsRegionAdapter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.cache.impl.bridge; +import org.hibernate.cache.Cache; import org.hibernate.cache.TimestampsRegion; -import org.hibernate.cache.Cache; import org.hibernate.cfg.Settings; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,14 +28,14 @@ import java.util.Iterator; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.MappingException; import org.hibernate.mapping.Collection; import org.hibernate.mapping.IndexedCollection; import org.hibernate.mapping.OneToMany; import org.hibernate.mapping.Selectable; import org.hibernate.mapping.Value; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Collection second pass Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Configuration.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Configuration.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Configuration.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -52,12 +52,6 @@ import org.dom4j.Attribute; import org.dom4j.DocumentException; import org.dom4j.Element; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.w3c.dom.Document; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; - import org.hibernate.EmptyInterceptor; import org.hibernate.HibernateException; import org.hibernate.Interceptor; @@ -66,7 +60,6 @@ import org.hibernate.MappingNotFoundException; import org.hibernate.SessionFactory; import org.hibernate.SessionFactoryObserver; -import org.hibernate.tuple.entity.EntityTuplizerFactory; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.function.SQLFunction; @@ -119,6 +112,7 @@ import org.hibernate.secure.JACCConfiguration; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.tool.hbm2ddl.TableMetadata; +import org.hibernate.tuple.entity.EntityTuplizerFactory; import org.hibernate.type.SerializationException; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; @@ -129,6 +123,11 @@ import org.hibernate.util.SerializationHelper; import org.hibernate.util.StringHelper; import org.hibernate.util.XMLHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.w3c.dom.Document; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; /** * An instance of <tt>Configuration</tt> allows the application Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,8 @@ import java.io.Serializable; +import org.hibernate.AssertionFailure; import org.hibernate.util.StringHelper; -import org.hibernate.AssertionFailure; /** * The default <tt>NamingStrategy</tt> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -34,14 +34,13 @@ import java.util.Map; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.Version; import org.hibernate.bytecode.BytecodeProvider; import org.hibernate.util.ConfigHelper; import org.hibernate.util.PropertiesHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/HbmBinder.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/HbmBinder.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/HbmBinder.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,8 +31,6 @@ import java.util.Properties; import java.util.StringTokenizer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.dom4j.Attribute; import org.dom4j.Document; import org.dom4j.Element; @@ -41,10 +39,10 @@ import org.hibernate.FetchMode; import org.hibernate.FlushMode; import org.hibernate.MappingException; +import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.FilterDefinition; import org.hibernate.engine.NamedQueryDefinition; import org.hibernate.engine.Versioning; -import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.id.PersistentIdentifierGenerator; import org.hibernate.mapping.Any; import org.hibernate.mapping.Array; @@ -98,6 +96,8 @@ import org.hibernate.util.JoinedIterator; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Walks an XML mapping document and produces the Hibernate configuration-time metamodel (the Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,8 @@ import java.io.Serializable; +import org.hibernate.AssertionFailure; import org.hibernate.util.StringHelper; -import org.hibernate.AssertionFailure; /** * An improved naming strategy that prefers embedded Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Mappings.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Mappings.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Mappings.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,28 +25,28 @@ package org.hibernate.cfg; import java.io.Serializable; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.HashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.DuplicateMappingException; import org.hibernate.MappingException; import org.hibernate.engine.FilterDefinition; import org.hibernate.engine.NamedQueryDefinition; import org.hibernate.engine.NamedSQLQueryDefinition; import org.hibernate.engine.ResultSetMappingDefinition; +import org.hibernate.mapping.AuxiliaryDatabaseObject; import org.hibernate.mapping.Collection; +import org.hibernate.mapping.Column; import org.hibernate.mapping.DenormalizedTable; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; import org.hibernate.mapping.TypeDef; -import org.hibernate.mapping.AuxiliaryDatabaseObject; -import org.hibernate.mapping.Column; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A collection of mappings from classes and collections to Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,16 @@ */ package org.hibernate.cfg; -import java.util.Map; import java.util.ArrayList; import java.util.Iterator; +import java.util.Map; +import org.dom4j.Attribute; +import org.dom4j.Element; import org.hibernate.MappingException; -import org.hibernate.util.StringHelper; import org.hibernate.engine.NamedSQLQueryDefinition; import org.hibernate.engine.ResultSetMappingDefinition; -import org.dom4j.Attribute; -import org.dom4j.Element; +import org.hibernate.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/ResultSetMappingBinder.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/ResultSetMappingBinder.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/ResultSetMappingBinder.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,25 +26,25 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; -import java.util.HashSet; -import java.util.Map; import org.dom4j.Element; import org.hibernate.LockMode; import org.hibernate.MappingException; +import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.engine.query.sql.NativeSQLQueryCollectionReturn; -import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.engine.query.sql.NativeSQLQueryJoinReturn; import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn; import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; import org.hibernate.mapping.Component; import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.Value; import org.hibernate.mapping.Property; import org.hibernate.mapping.ToOne; +import org.hibernate.mapping.Value; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; import org.hibernate.util.ArrayHelper; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Settings.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Settings.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Settings.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,7 +28,6 @@ import org.hibernate.ConnectionReleaseMode; import org.hibernate.EntityMode; -import org.hibernate.tuple.entity.EntityTuplizerFactory; import org.hibernate.cache.QueryCacheFactory; import org.hibernate.cache.RegionFactory; import org.hibernate.connection.ConnectionProvider; @@ -40,6 +39,7 @@ import org.hibernate.jdbc.util.SQLStatementLogger; import org.hibernate.transaction.TransactionFactory; import org.hibernate.transaction.TransactionManagerLookup; +import org.hibernate.tuple.entity.EntityTuplizerFactory; /** * Settings that affect the behaviour of Hibernate at runtime. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/SettingsFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/SettingsFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/SettingsFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,9 +32,6 @@ import java.util.Map; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.ConnectionReleaseMode; import org.hibernate.EntityMode; import org.hibernate.HibernateException; @@ -63,6 +60,8 @@ import org.hibernate.util.PropertiesHelper; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Reads configuration properties and builds a {@link Settings} instance. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,14 +32,14 @@ import java.util.Collection; import java.util.Iterator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.EntityMode; import org.hibernate.HibernateException; +import org.hibernate.engine.SessionImplementor; import org.hibernate.loader.CollectionAliases; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A persistent wrapper for an array. Lazy initialization Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentElementHolder.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentElementHolder.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentElementHolder.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -35,8 +35,8 @@ import org.dom4j.Element; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; +import org.hibernate.engine.SessionImplementor; import org.hibernate.loader.CollectionAliases; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.type.Type; import org.hibernate.util.CollectionHelper; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentIdentifierBag.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentIdentifierBag.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentIdentifierBag.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -37,8 +37,8 @@ import org.hibernate.EntityMode; import org.hibernate.HibernateException; +import org.hibernate.engine.SessionImplementor; import org.hibernate.loader.CollectionAliases; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.type.Type; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentIndexedElementHolder.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentIndexedElementHolder.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/PersistentIndexedElementHolder.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -37,9 +37,9 @@ import org.dom4j.Element; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.loader.CollectionAliases; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; +import org.hibernate.loader.CollectionAliases; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.type.NullableType; import org.hibernate.type.Type; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/ConnectionProviderFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,24 +24,23 @@ */ package org.hibernate.connection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Properties; -import java.util.Set; -import java.util.Map; -import java.beans.Introspector; import java.beans.BeanInfo; import java.beans.IntrospectionException; +import java.beans.Introspector; import java.beans.PropertyDescriptor; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Instantiates a connection provider given either <tt>System</tt> properties or Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/DatasourceConnectionProvider.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/DatasourceConnectionProvider.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/DatasourceConnectionProvider.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -33,7 +33,6 @@ import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.util.NamingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/DriverManagerConnectionProvider.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/DriverManagerConnectionProvider.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/DriverManagerConnectionProvider.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,12 +31,12 @@ import java.util.Iterator; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.util.PropertiesHelper; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A connection provider that uses <tt>java.sql.DriverManager</tt>. This provider Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/UserSuppliedConnectionProvider.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/UserSuppliedConnectionProvider.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/connection/UserSuppliedConnectionProvider.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,8 +27,8 @@ import java.sql.Connection; import java.util.Properties; +import org.hibernate.HibernateException; import org.slf4j.LoggerFactory; -import org.hibernate.HibernateException; /** * An implementation of the <literal>ConnectionProvider</literal> interface that Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/CurrentSessionContext.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/CurrentSessionContext.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/CurrentSessionContext.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.context; +import java.io.Serializable; + import org.hibernate.HibernateException; -import java.io.Serializable; - /** * Defines the contract for implementations which know how to scope the notion * of a {@link org.hibernate.SessionFactory#getCurrentSession() current session}. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/JTASessionContext.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/JTASessionContext.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/JTASessionContext.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,20 +24,21 @@ */ package org.hibernate.context; +import java.util.Hashtable; +import java.util.Map; + +import javax.transaction.Synchronization; +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; + +import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; -import org.hibernate.ConnectionReleaseMode; import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.util.JTAHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.Synchronization; -import java.util.Map; -import java.util.Hashtable; - /** * An implementation of {@link CurrentSessionContext} which scopes the notion * of a current session to a JTA transaction. Because JTA gives us a nice Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/ManagedSessionContext.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/ManagedSessionContext.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/ManagedSessionContext.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.context; -import org.hibernate.classic.Session; +import java.util.HashMap; +import java.util.Map; + import org.hibernate.HibernateException; import org.hibernate.SessionFactory; +import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; -import java.util.Map; -import java.util.HashMap; - /** * Represents a {@link CurrentSessionContext} the notion of a contextual session * is managed by some external entity (generally some form of interceptor, etc). Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -34,15 +34,16 @@ import java.lang.reflect.Proxy; import java.util.HashMap; import java.util.Map; + import javax.transaction.Synchronization; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; import org.hibernate.SessionFactory; import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A {@link CurrentSessionContext} impl which scopes the notion of current Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/InExpression.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/InExpression.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/InExpression.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,9 +29,7 @@ import org.hibernate.Criteria; import org.hibernate.EntityMode; import org.hibernate.HibernateException; - import org.hibernate.engine.TypedValue; - import org.hibernate.type.AbstractComponentType; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/SubqueryExpression.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/SubqueryExpression.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/criterion/SubqueryExpression.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,8 @@ import org.hibernate.HibernateException; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.TypedValue; -import org.hibernate.engine.SessionImplementor; import org.hibernate.impl.CriteriaImpl; import org.hibernate.loader.criteria.CriteriaJoinWalker; import org.hibernate.loader.criteria.CriteriaQueryTranslator; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,8 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; +import java.util.Iterator; import java.util.Map; -import java.util.Iterator; import org.hibernate.Hibernate; import org.hibernate.LockMode; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Cache71Dialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Cache71Dialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Cache71Dialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -33,14 +33,14 @@ import org.hibernate.LockMode; import org.hibernate.MappingException; import org.hibernate.cfg.Environment; +import org.hibernate.dialect.function.ConditionalParenthesisFunction; +import org.hibernate.dialect.function.ConvertFunction; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.NvlFunction; import org.hibernate.dialect.function.SQLFunctionTemplate; +import org.hibernate.dialect.function.StandardJDBCEscapeFunction; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.function.VarArgsSQLFunction; -import org.hibernate.dialect.function.StandardJDBCEscapeFunction; -import org.hibernate.dialect.function.ConvertFunction; -import org.hibernate.dialect.function.ConditionalParenthesisFunction; import org.hibernate.dialect.lock.LockingStrategy; import org.hibernate.dialect.lock.SelectLockingStrategy; import org.hibernate.dialect.lock.UpdateLockingStrategy; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/DB2Dialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/DB2Dialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/DB2Dialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,11 +31,11 @@ import org.hibernate.Hibernate; import org.hibernate.cfg.Environment; +import org.hibernate.dialect.function.AnsiTrimEmulationFunction; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.function.VarArgsSQLFunction; -import org.hibernate.dialect.function.AnsiTrimEmulationFunction; /** * An SQL dialect for DB2. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/DerbyDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/DerbyDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/DerbyDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,22 +24,22 @@ */ package org.hibernate.dialect; +import java.util.ArrayList; +import java.util.List; + import org.hibernate.Hibernate; +import org.hibernate.HibernateException; import org.hibernate.QueryException; -import org.hibernate.HibernateException; +import org.hibernate.dialect.function.DerbyConcatFunction; +import org.hibernate.dialect.function.SQLFunction; +import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.type.Type; -import org.hibernate.dialect.function.SQLFunction; -import org.hibernate.dialect.function.SQLFunctionTemplate; -import org.hibernate.dialect.function.DerbyConcatFunction; import org.hibernate.id.TableHiLoGenerator; import org.hibernate.sql.CaseFragment; import org.hibernate.sql.DerbyCaseFragment; +import org.hibernate.type.Type; -import java.util.List; -import java.util.ArrayList; - /** * Hibernate Dialect for Cloudscape 10 - aka Derby. This implements both an * override for the identity column generator as well as for the case statement Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Dialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Dialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Dialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -34,8 +34,6 @@ import java.util.Properties; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.LockMode; @@ -60,11 +58,13 @@ import org.hibernate.sql.ANSICaseFragment; import org.hibernate.sql.ANSIJoinFragment; import org.hibernate.sql.CaseFragment; +import org.hibernate.sql.ForUpdateFragment; import org.hibernate.sql.JoinFragment; -import org.hibernate.sql.ForUpdateFragment; import org.hibernate.type.Type; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Represents a dialect of SQL implemented by a particular RDBMS. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/FrontBaseDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/FrontBaseDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/FrontBaseDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.dialect; +import java.sql.Types; + +import org.hibernate.LockMode; import org.hibernate.dialect.lock.LockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; import org.hibernate.dialect.lock.UpdateLockingStrategy; -import org.hibernate.dialect.lock.SelectLockingStrategy; import org.hibernate.persister.entity.Lockable; -import org.hibernate.LockMode; -import java.sql.Types; - /** * An SQL Dialect for Frontbase. Assumes you're using the latest version * of the FrontBase JDBC driver, available from <tt>http://frontbase.com/</tt> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/HSQLDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/HSQLDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/HSQLDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,25 +24,25 @@ */ package org.hibernate.dialect; +import java.io.Serializable; import java.sql.SQLException; import java.sql.Types; -import java.io.Serializable; import org.hibernate.Hibernate; +import org.hibernate.JDBCException; import org.hibernate.LockMode; import org.hibernate.StaleObjectStateException; -import org.hibernate.JDBCException; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.persister.entity.Lockable; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.function.VarArgsSQLFunction; import org.hibernate.dialect.lock.LockingStrategy; import org.hibernate.dialect.lock.SelectLockingStrategy; +import org.hibernate.engine.SessionImplementor; import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.exception.TemplatedViolatedConstraintNameExtracter; import org.hibernate.exception.ViolatedConstraintNameExtracter; +import org.hibernate.persister.entity.Lockable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/InformixDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/InformixDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/InformixDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,8 +27,8 @@ import java.sql.SQLException; import java.sql.Types; +import org.hibernate.Hibernate; import org.hibernate.MappingException; -import org.hibernate.Hibernate; import org.hibernate.dialect.function.VarArgsSQLFunction; import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.exception.TemplatedViolatedConstraintNameExtracter; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/IngresDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/IngresDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/IngresDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,8 +27,8 @@ import java.sql.Types; import org.hibernate.Hibernate; +import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.SQLFunctionTemplate; -import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.function.VarArgsSQLFunction; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/MckoiDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/MckoiDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/MckoiDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,12 +28,12 @@ import org.hibernate.Hibernate; import org.hibernate.LockMode; -import org.hibernate.persister.entity.Lockable; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.lock.LockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; import org.hibernate.dialect.lock.UpdateLockingStrategy; -import org.hibernate.dialect.lock.SelectLockingStrategy; +import org.hibernate.persister.entity.Lockable; import org.hibernate.sql.CaseFragment; import org.hibernate.sql.MckoiCaseFragment; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,7 +28,7 @@ import org.hibernate.Hibernate; import org.hibernate.cfg.Environment; -import org.hibernate.dialect.function.*; +import org.hibernate.dialect.function.StandardSQLFunction; /** * An Hibernate 3 SQL dialect for Mimer SQL. This dialect requires Mimer SQL 9.2.1 or later Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle10gDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle10gDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle10gDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.dialect; +import org.hibernate.sql.ANSIJoinFragment; import org.hibernate.sql.JoinFragment; -import org.hibernate.sql.ANSIJoinFragment; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,27 +24,27 @@ */ package org.hibernate.dialect; +import java.sql.CallableStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Types; -import java.sql.SQLException; -import java.sql.ResultSet; -import java.sql.CallableStatement; +import org.hibernate.Hibernate; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Environment; +import org.hibernate.dialect.function.NoArgSQLFunction; +import org.hibernate.dialect.function.NvlFunction; +import org.hibernate.dialect.function.SQLFunctionTemplate; +import org.hibernate.dialect.function.StandardSQLFunction; +import org.hibernate.dialect.function.VarArgsSQLFunction; +import org.hibernate.exception.JDBCExceptionHelper; +import org.hibernate.exception.TemplatedViolatedConstraintNameExtracter; +import org.hibernate.exception.ViolatedConstraintNameExtracter; import org.hibernate.sql.CaseFragment; import org.hibernate.sql.DecodeCaseFragment; import org.hibernate.sql.JoinFragment; import org.hibernate.sql.OracleJoinFragment; -import org.hibernate.cfg.Environment; -import org.hibernate.dialect.function.StandardSQLFunction; -import org.hibernate.dialect.function.NoArgSQLFunction; -import org.hibernate.dialect.function.VarArgsSQLFunction; -import org.hibernate.dialect.function.SQLFunctionTemplate; -import org.hibernate.dialect.function.NvlFunction; -import org.hibernate.Hibernate; -import org.hibernate.HibernateException; import org.hibernate.util.ReflectHelper; -import org.hibernate.exception.ViolatedConstraintNameExtracter; -import org.hibernate.exception.TemplatedViolatedConstraintNameExtracter; -import org.hibernate.exception.JDBCExceptionHelper; /** * A dialect for Oracle 8i. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,9 +29,6 @@ import java.sql.SQLException; import java.sql.Types; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; @@ -44,6 +41,8 @@ import org.hibernate.exception.TemplatedViolatedConstraintNameExtracter; import org.hibernate.exception.ViolatedConstraintNameExtracter; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An SQL dialect for Oracle 9 (uses ANSI-style syntax where possible). Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,8 @@ import java.sql.Types; +import org.hibernate.sql.ANSICaseFragment; import org.hibernate.sql.CaseFragment; -import org.hibernate.sql.ANSICaseFragment; /** * A dialect for Oracle 9i databases. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/OracleDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/OracleDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/OracleDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,13 +26,12 @@ import java.sql.Types; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.sql.CaseFragment; import org.hibernate.sql.DecodeCaseFragment; import org.hibernate.sql.JoinFragment; import org.hibernate.sql.OracleJoinFragment; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An SQL dialect for Oracle, compatible with Oracle 8. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/PointbaseDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/PointbaseDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/PointbaseDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.dialect; +import java.sql.Types; + +import org.hibernate.LockMode; import org.hibernate.dialect.lock.LockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; import org.hibernate.dialect.lock.UpdateLockingStrategy; -import org.hibernate.dialect.lock.SelectLockingStrategy; import org.hibernate.persister.entity.Lockable; -import org.hibernate.LockMode; -import java.sql.Types; - /** * A <tt>Dialect</tt> for Pointbase. * @author Ed Mackenzie Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.dialect; -import java.sql.Types; -import java.sql.SQLException; import java.sql.CallableStatement; import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; import org.hibernate.Hibernate; import org.hibernate.dialect.function.NoArgSQLFunction; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,16 @@ */ package org.hibernate.dialect; +import java.sql.Types; + +import org.hibernate.Hibernate; +import org.hibernate.LockMode; import org.hibernate.dialect.function.NoArgSQLFunction; +import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.StandardSQLFunction; -import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.lock.LockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; import org.hibernate.dialect.lock.UpdateLockingStrategy; -import org.hibernate.dialect.lock.SelectLockingStrategy; - -import java.sql.Types; -import org.hibernate.Hibernate; -import org.hibernate.LockMode; import org.hibernate.persister.entity.Lockable; import org.hibernate.sql.CaseFragment; import org.hibernate.sql.DecodeCaseFragment; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.dialect; +import java.io.ObjectStreamException; import java.io.Serializable; -import java.io.ObjectStreamException; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; /** * Defines how we need to reference columns in the group-by, having, and order-by Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SAPDBDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SAPDBDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SAPDBDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,13 +29,13 @@ import org.hibernate.Hibernate; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.NoArgSQLFunction; +import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.function.VarArgsSQLFunction; -import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.sql.CaseFragment; import org.hibernate.sql.DecodeCaseFragment; +import org.hibernate.sql.JoinFragment; import org.hibernate.sql.OracleJoinFragment; -import org.hibernate.sql.JoinFragment; import org.hibernate.util.StringHelper; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/SQLServerDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,9 +28,9 @@ import org.hibernate.Hibernate; import org.hibernate.LockMode; +import org.hibernate.dialect.function.AnsiTrimEmulationFunction; import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.StandardSQLFunction; -import org.hibernate.dialect.function.AnsiTrimEmulationFunction; /** * A dialect for Microsoft SQL Server 2000 and 2005 Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/TimesTenDialect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/TimesTenDialect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/TimesTenDialect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,13 +28,13 @@ import org.hibernate.Hibernate; import org.hibernate.LockMode; -import org.hibernate.persister.entity.Lockable; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.lock.LockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; import org.hibernate.dialect.lock.UpdateLockingStrategy; -import org.hibernate.dialect.lock.SelectLockingStrategy; +import org.hibernate.persister.entity.Lockable; import org.hibernate.sql.JoinFragment; import org.hibernate.sql.OracleJoinFragment; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/TypeNames.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/TypeNames.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/TypeNames.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.dialect; +import java.util.HashMap; +import java.util.Iterator; import java.util.Map; -import java.util.HashMap; import java.util.TreeMap; -import java.util.Iterator; import org.hibernate.MappingException; import org.hibernate.util.StringHelper; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/AbstractAnsiTrimEmulationFunction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/AbstractAnsiTrimEmulationFunction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/AbstractAnsiTrimEmulationFunction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,15 +23,15 @@ */ package org.hibernate.dialect.function; +import java.util.ArrayList; +import java.util.List; + import org.hibernate.Hibernate; import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.Type; -import java.util.List; -import java.util.ArrayList; - /** * A {@link org.hibernate.dialect.function.SQLFunction} providing support for implementing TRIM functionality * (as defined by both the ANSI SQL and JPA specs) in cases where the dialect may not support the full <tt>trim</tt> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/ConvertFunction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/ConvertFunction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/ConvertFunction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,8 @@ import java.util.List; +import org.hibernate.Hibernate; import org.hibernate.QueryException; -import org.hibernate.Hibernate; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.Type; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/DerbyConcatFunction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/DerbyConcatFunction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/DerbyConcatFunction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.dialect.function; +import java.util.Iterator; import java.util.List; -import java.util.Iterator; import org.hibernate.Hibernate; import org.hibernate.QueryException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/SQLFunctionTemplate.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/SQLFunctionTemplate.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/SQLFunctionTemplate.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.dialect.function; +import java.util.ArrayList; +import java.util.List; + import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.Type; -import java.util.ArrayList; -import java.util.List; - /** * Represents HQL functions that can have different representations in different SQL dialects. * E.g. in HQL we can define function <code>concat(?1, ?2)</code> to concatenate two strings Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/StandardJDBCEscapeFunction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/StandardJDBCEscapeFunction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/function/StandardJDBCEscapeFunction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,8 @@ import java.util.List; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.Type; -import org.hibernate.engine.SessionFactoryImplementor; /** * Analogous to {@link org.hibernate.dialect.function.StandardSQLFunction} Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.dialect.lock; +import java.io.Serializable; + +import org.hibernate.JDBCException; +import org.hibernate.StaleObjectStateException; import org.hibernate.engine.SessionImplementor; -import org.hibernate.StaleObjectStateException; -import org.hibernate.JDBCException; -import java.io.Serializable; - /** * A strategy abstraction for how locks are obtained in the underlying database. * <p/> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,21 +24,21 @@ */ package org.hibernate.dialect.lock; -import org.hibernate.persister.entity.Lockable; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.StaleObjectStateException; -import org.hibernate.JDBCException; -import org.hibernate.LockMode; -import org.hibernate.sql.SimpleSelect; -import org.hibernate.pretty.MessageHelper; -import org.hibernate.exception.JDBCExceptionHelper; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import org.hibernate.JDBCException; +import org.hibernate.LockMode; +import org.hibernate.StaleObjectStateException; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.exception.JDBCExceptionHelper; +import org.hibernate.persister.entity.Lockable; +import org.hibernate.pretty.MessageHelper; +import org.hibernate.sql.SimpleSelect; + /** * A locking strategy where the locks are obtained through select statements. * <p/> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,23 +24,23 @@ */ package org.hibernate.dialect.lock; -import org.hibernate.persister.entity.Lockable; +import java.io.Serializable; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +import org.hibernate.HibernateException; +import org.hibernate.JDBCException; import org.hibernate.LockMode; -import org.hibernate.HibernateException; import org.hibernate.StaleObjectStateException; -import org.hibernate.JDBCException; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.exception.JDBCExceptionHelper; +import org.hibernate.persister.entity.Lockable; import org.hibernate.pretty.MessageHelper; -import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.sql.Update; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.SessionFactoryImplementor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Serializable; -import java.sql.PreparedStatement; -import java.sql.SQLException; - /** * A locking strategy where the locks are obtained through update statements. * <p/> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/AbstractDialectResolver.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/AbstractDialectResolver.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/AbstractDialectResolver.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,13 +27,12 @@ import java.sql.DatabaseMetaData; import java.sql.SQLException; +import org.hibernate.JDBCException; +import org.hibernate.dialect.Dialect; +import org.hibernate.exception.JDBCConnectionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.dialect.Dialect; -import org.hibernate.exception.JDBCConnectionException; -import org.hibernate.JDBCException; - /** * A templated resolver impl which delegates to the {@link #resolveDialectInternal} method * and handles any thrown {@link SQLException}s. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/BasicDialectResolver.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/BasicDialectResolver.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/BasicDialectResolver.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,8 +27,8 @@ import java.sql.DatabaseMetaData; import java.sql.SQLException; +import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; -import org.hibernate.HibernateException; /** * Intended as support for custom resolvers. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/BasicSQLExceptionConverter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/BasicSQLExceptionConverter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/BasicSQLExceptionConverter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,9 +26,9 @@ import java.sql.SQLException; +import org.hibernate.JDBCException; import org.hibernate.exception.SQLStateConverter; import org.hibernate.exception.ViolatedConstraintNameExtracter; -import org.hibernate.JDBCException; /** * A helper to centralize conversion of {@link java.sql.SQLException}s to {@link org.hibernate.JDBCException}s. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,16 +25,13 @@ package org.hibernate.dialect.resolver; import java.sql.Connection; -import java.sql.SQLException; import java.sql.DatabaseMetaData; +import java.sql.SQLException; import java.util.Properties; import org.hibernate.HibernateException; -import org.hibernate.dialect.resolver.DialectResolver; -import org.hibernate.dialect.resolver.DialectResolverSet; -import org.hibernate.dialect.resolver.StandardDialectResolver; -import org.hibernate.dialect.Dialect; import org.hibernate.cfg.Environment; +import org.hibernate.dialect.Dialect; import org.hibernate.util.ReflectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectResolverSet.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectResolverSet.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectResolverSet.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,12 +29,11 @@ import java.util.Iterator; import java.util.List; +import org.hibernate.dialect.Dialect; +import org.hibernate.exception.JDBCConnectionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.dialect.Dialect; -import org.hibernate.exception.JDBCConnectionException; - /** * A {@link DialectResolver} implementation which coordinates resolution by delegating to its * registered sub-resolvers. Sub-resolvers may be registered by calling either {@link #addResolver} or Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,23 +27,22 @@ import java.sql.DatabaseMetaData; import java.sql.SQLException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.hibernate.dialect.DB2Dialect; +import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.H2Dialect; +import org.hibernate.dialect.HSQLDialect; +import org.hibernate.dialect.InformixDialect; +import org.hibernate.dialect.IngresDialect; import org.hibernate.dialect.MySQLDialect; +import org.hibernate.dialect.Oracle10gDialect; +import org.hibernate.dialect.Oracle8iDialect; +import org.hibernate.dialect.Oracle9iDialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.dialect.DerbyDialect; -import org.hibernate.dialect.IngresDialect; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.SybaseASE15Dialect; -import org.hibernate.dialect.InformixDialect; -import org.hibernate.dialect.DB2Dialect; -import org.hibernate.dialect.Oracle10gDialect; -import org.hibernate.dialect.Oracle9iDialect; -import org.hibernate.dialect.Oracle8iDialect; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The standard Hibernate resolver. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ActionQueue.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ActionQueue.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ActionQueue.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -35,9 +35,6 @@ import java.util.List; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.action.BulkOperationCleanupAction; @@ -51,6 +48,8 @@ import org.hibernate.action.Executable; import org.hibernate.cache.CacheException; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Responsible for maintaining the queue of actions related to events. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Cascade.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Cascade.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Cascade.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,8 +28,6 @@ import java.util.HashSet; import java.util.Iterator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.collection.PersistentCollection; @@ -42,6 +40,8 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.util.CollectionHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Delegate responsible for, in conjunction with the various Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CascadingAction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CascadingAction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CascadingAction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,19 +28,19 @@ import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.ReplicationMode; import org.hibernate.TransientObjectException; -import org.hibernate.proxy.HibernateProxy; -import org.hibernate.persister.entity.EntityPersister; import org.hibernate.collection.PersistentCollection; import org.hibernate.event.EventSource; +import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.proxy.HibernateProxy; import org.hibernate.type.CollectionType; +import org.hibernate.type.EntityType; import org.hibernate.type.Type; -import org.hibernate.type.EntityType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A session action that may be cascaded from parent entity to its children Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CollectionEntry.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CollectionEntry.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CollectionEntry.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,20 +24,20 @@ */ package org.hibernate.engine; -import java.io.Serializable; -import java.io.ObjectOutputStream; import java.io.IOException; import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; import java.util.Collection; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * We need an entry to tell us all about the current state Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CollectionKey.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CollectionKey.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/CollectionKey.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,16 @@ */ package org.hibernate.engine; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + import org.hibernate.EntityMode; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; -import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; - /** * Uniquely identifies a collection instance in a particular session. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Collections.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Collections.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Collections.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.engine; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.io.Serializable; + import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.HibernateException; @@ -33,9 +33,9 @@ import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.CollectionType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import java.io.Serializable; - /** * Implements book-keeping for the collection persistence by reachability algorithm * @author Gavin King Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityEntry.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityEntry.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityEntry.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,11 @@ */ package org.hibernate.engine; -import java.io.Serializable; -import java.io.ObjectOutputStream; import java.io.IOException; import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.LockMode; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityKey.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityKey.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityKey.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.engine; -import java.io.Serializable; -import java.io.ObjectOutputStream; import java.io.IOException; import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityUniqueKey.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityUniqueKey.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/EntityUniqueKey.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,15 +24,15 @@ */ package org.hibernate.engine; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + import org.hibernate.EntityMode; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; -import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; - /** * Used to uniquely key an entity instance in relation to a particular session * by some unique property reference, as opposed to identifier. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ExecuteUpdateResultCheckStyle.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ExecuteUpdateResultCheckStyle.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ExecuteUpdateResultCheckStyle.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.engine; +import java.io.InvalidObjectException; +import java.io.ObjectStreamException; import java.io.Serializable; -import java.io.ObjectStreamException; -import java.io.InvalidObjectException; /** * For persistence operations (INSERT, UPDATE, DELETE) what style of determining Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/FilterDefinition.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/FilterDefinition.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/FilterDefinition.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,13 +24,13 @@ */ package org.hibernate.engine; -import org.hibernate.type.Type; - import java.io.Serializable; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; import java.util.Set; +import org.hibernate.type.Type; + /** * A FilterDefinition defines the global attributes of a dynamic filter. This * information includes its name as well as its defined parameters (name and type). Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/HibernateIterator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/HibernateIterator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/HibernateIterator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.engine; +import java.util.Iterator; + import org.hibernate.JDBCException; -import java.util.Iterator; - /** * An iterator that may be "closed" * @see org.hibernate.Hibernate#close(java.util.Iterator) Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/JoinSequence.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/JoinSequence.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/JoinSequence.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,8 @@ import java.util.Map; import org.hibernate.MappingException; +import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.Joinable; -import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.sql.JoinFragment; import org.hibernate.sql.QueryJoinFragment; import org.hibernate.type.AssociationType; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/NamedSQLQueryDefinition.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/NamedSQLQueryDefinition.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/NamedSQLQueryDefinition.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; +import org.hibernate.CacheMode; import org.hibernate.FlushMode; -import org.hibernate.CacheMode; import org.hibernate.engine.query.sql.NativeSQLQueryReturn; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ParameterBinder.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ParameterBinder.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ParameterBinder.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,16 @@ */ package org.hibernate.engine; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.Iterator; +import java.util.Map; + import org.hibernate.HibernateException; import org.hibernate.type.Type; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Map; -import java.util.Iterator; - /** * Centralizes the commonality regarding binding of parameter values into * PreparedStatements as this logic is used in many places. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/PersistenceContext.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/PersistenceContext.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/PersistenceContext.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,8 +31,8 @@ import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.MappingException; +import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.loading.LoadContexts; -import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/QueryParameters.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/QueryParameters.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/QueryParameters.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,19 +32,18 @@ import java.util.Map; import java.util.StringTokenizer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.QueryException; import org.hibernate.ScrollMode; -import org.hibernate.impl.FilterImpl; import org.hibernate.dialect.Dialect; import org.hibernate.hql.classic.ParserHelper; +import org.hibernate.impl.FilterImpl; import org.hibernate.pretty.Printer; import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Gavin King Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ResultSetMappingDefinition.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ResultSetMappingDefinition.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ResultSetMappingDefinition.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.engine; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import java.io.Serializable; import org.hibernate.engine.query.sql.NativeSQLQueryReturn; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/SessionFactoryImplementor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/SessionFactoryImplementor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/SessionFactoryImplementor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,30 +24,30 @@ */ package org.hibernate.engine; +import java.sql.Connection; import java.util.Map; import java.util.Set; -import java.sql.Connection; import javax.transaction.TransactionManager; +import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.MappingException; import org.hibernate.SessionFactory; -import org.hibernate.ConnectionReleaseMode; -import org.hibernate.proxy.EntityNotFoundDelegate; -import org.hibernate.engine.query.QueryPlanCache; -import org.hibernate.persister.collection.CollectionPersister; -import org.hibernate.persister.entity.EntityPersister; import org.hibernate.cache.QueryCache; +import org.hibernate.cache.Region; import org.hibernate.cache.UpdateTimestampsCache; -import org.hibernate.cache.Region; import org.hibernate.cfg.Settings; import org.hibernate.connection.ConnectionProvider; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.SQLFunctionRegistry; +import org.hibernate.engine.query.QueryPlanCache; import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.id.IdentifierGenerator; +import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.proxy.EntityNotFoundDelegate; import org.hibernate.stat.StatisticsImplementor; import org.hibernate.type.Type; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/SessionImplementor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/SessionImplementor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/SessionImplementor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -39,8 +39,8 @@ import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.Transaction; +import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; -import org.hibernate.collection.PersistentCollection; import org.hibernate.event.EventListeners; import org.hibernate.impl.CriteriaImpl; import org.hibernate.jdbc.Batcher; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -37,8 +37,6 @@ import java.util.Map; import org.apache.commons.collections.map.ReferenceMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.AssertionFailure; import org.hibernate.Hibernate; import org.hibernate.HibernateException; @@ -47,16 +45,18 @@ import org.hibernate.NonUniqueObjectException; import org.hibernate.PersistentObjectException; import org.hibernate.TransientObjectException; +import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.loading.LoadContexts; -import org.hibernate.pretty.MessageHelper; -import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.pretty.MessageHelper; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; import org.hibernate.tuple.ElementWrapper; import org.hibernate.util.IdentityMap; import org.hibernate.util.MarkerObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A <tt>PersistenceContext</tt> represents the state of persistent "stuff" which Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Status.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Status.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Status.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.engine; +import java.io.InvalidObjectException; +import java.io.ObjectStreamException; import java.io.Serializable; -import java.io.ObjectStreamException; -import java.io.InvalidObjectException; /** * Represents the status of an entity with respect to Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,6 @@ import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.AssertionFailure; import org.hibernate.CacheMode; import org.hibernate.HibernateException; @@ -44,6 +42,8 @@ import org.hibernate.property.BackrefPropertyAccessor; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Functionality relating to Hibernate's two-phase loading process, Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ValueInclusion.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ValueInclusion.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/ValueInclusion.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.engine; +import java.io.ObjectStreamException; import java.io.Serializable; -import java.io.ObjectStreamException; import java.io.StreamCorruptedException; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/VersionValue.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/VersionValue.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/VersionValue.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.engine; +import org.hibernate.MappingException; +import org.hibernate.id.IdentifierGeneratorFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.MappingException; -import org.hibernate.id.IdentifierGeneratorFactory; /** * A strategy for determining if a version value is an version of Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Versioning.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Versioning.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/Versioning.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,11 @@ */ package org.hibernate.engine; +import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.type.VersionType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.type.VersionType; - /** * Utilities for dealing with optimistic locking values. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,14 +23,14 @@ */ package org.hibernate.engine.jdbc; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.sql.Blob; import java.sql.SQLException; -import java.io.InputStream; -import java.io.ByteArrayInputStream; -import java.io.IOException; /** * Manages aspects of proxying {@link Blob Blobs} for non-contextual creation, including proxy creation and Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,15 +23,15 @@ */ package org.hibernate.engine.jdbc; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.io.StringReader; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.sql.Clob; import java.sql.SQLException; -import java.io.Reader; -import java.io.StringReader; -import java.io.InputStream; -import java.io.IOException; /** * Manages aspects of proxying {@link Clob Clobs} for non-contextual creation, including proxy creation and Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,8 +23,8 @@ */ package org.hibernate.engine.jdbc; +import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.ResultSet; import java.util.HashMap; import java.util.Map; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,17 +23,17 @@ */ package org.hibernate.engine.jdbc; -import java.sql.Blob; -import java.sql.SQLException; -import java.sql.Clob; -import java.sql.Connection; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; import java.io.Reader; import java.io.Writer; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.SQLException; import org.hibernate.HibernateException; import org.hibernate.JDBCException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/JdbcSupportLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/JdbcSupportLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/JdbcSupportLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,10 +23,10 @@ */ package org.hibernate.engine.jdbc; +import java.lang.reflect.Method; import java.sql.Connection; +import java.sql.DatabaseMetaData; import java.sql.SQLException; -import java.sql.DatabaseMetaData; -import java.lang.reflect.Method; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,10 +23,10 @@ */ package org.hibernate.engine.jdbc; +import java.io.InputStream; +import java.io.Reader; import java.sql.Blob; import java.sql.Clob; -import java.io.InputStream; -import java.io.Reader; /** * Contract for creating various LOB references. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,9 +23,9 @@ */ package org.hibernate.engine.jdbc; -import java.sql.Clob; import java.io.Reader; import java.lang.reflect.Proxy; +import java.sql.Clob; /** * Manages aspects of proxying java.sql.NClobs for non-contextual creation, including proxy creation and Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,10 +23,10 @@ */ package org.hibernate.engine.jdbc; +import java.io.InputStream; +import java.io.Reader; import java.sql.Blob; import java.sql.Clob; -import java.io.InputStream; -import java.io.Reader; /** * {@link LobCreator} implementation using non-contextual or local creation, meaning that we generate the LOB Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,17 +24,16 @@ package org.hibernate.engine.jdbc; import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; import java.sql.ResultSet; import java.sql.SQLException; +import org.hibernate.util.JDBCExceptionReporter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.util.JDBCExceptionReporter; - /** * A proxy for a ResultSet delegate, responsible for locally caching the columnName-to-columnIndex resolution that * has been found to be inefficient in a few vendor's drivers (i.e., Oracle and Postgres). Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,12 +23,12 @@ */ package org.hibernate.engine.jdbc; -import java.sql.Blob; +import java.io.Serializable; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Proxy; -import java.lang.reflect.InvocationHandler; -import java.io.Serializable; +import java.sql.Blob; import org.hibernate.HibernateException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,12 +23,12 @@ */ package org.hibernate.engine.jdbc; +import java.io.Serializable; import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Proxy; import java.sql.Clob; -import java.io.Serializable; import org.hibernate.HibernateException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,8 +23,8 @@ */ package org.hibernate.engine.jdbc; +import java.lang.reflect.Proxy; import java.sql.Clob; -import java.lang.reflect.Proxy; /** * Manages aspects of proxying java.sql.NClobs to add serializability. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/StreamUtils.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/StreamUtils.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/StreamUtils.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,9 +23,9 @@ */ package org.hibernate.engine.jdbc; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; import java.io.Reader; import java.io.Writer; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,29 +24,28 @@ */ package org.hibernate.engine.loading; -import java.sql.ResultSet; import java.io.Serializable; -import java.util.List; -import java.util.Iterator; +import java.sql.ResultSet; import java.util.ArrayList; -import java.util.Set; import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.hibernate.collection.PersistentCollection; -import org.hibernate.persister.collection.CollectionPersister; -import org.hibernate.EntityMode; import org.hibernate.CacheMode; -import org.hibernate.cache.entry.CollectionCacheEntry; +import org.hibernate.EntityMode; import org.hibernate.cache.CacheKey; -import org.hibernate.pretty.MessageHelper; -import org.hibernate.engine.CollectionKey; -import org.hibernate.engine.Status; -import org.hibernate.engine.SessionImplementor; +import org.hibernate.cache.entry.CollectionCacheEntry; +import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.CollectionEntry; +import org.hibernate.engine.CollectionKey; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.engine.Status; +import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.pretty.MessageHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Represents state associated with the processing of a given {@link ResultSet} Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,8 +25,8 @@ package org.hibernate.engine.loading; import java.sql.ResultSet; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/LoadContexts.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/LoadContexts.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/loading/LoadContexts.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,24 +24,23 @@ */ package org.hibernate.engine.loading; +import java.io.Serializable; import java.sql.ResultSet; +import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.Iterator; -import java.util.HashMap; -import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.hibernate.util.IdentityMap; -import org.hibernate.engine.PersistenceContext; +import org.hibernate.EntityMode; +import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.CollectionKey; +import org.hibernate.engine.PersistenceContext; import org.hibernate.engine.SessionImplementor; -import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; -import org.hibernate.EntityMode; +import org.hibernate.util.IdentityMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Maps {@link ResultSet result-sets} to specific contextual data Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/FilterQueryPlan.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/FilterQueryPlan.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/FilterQueryPlan.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.engine.query; -import org.hibernate.engine.SessionFactoryImplementor; - import java.io.Serializable; import java.util.Map; +import org.hibernate.engine.SessionFactoryImplementor; + /** * Extends an HQLQueryPlan to maintain a reference to the collection-role name * being filtered. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,35 +24,35 @@ */ package org.hibernate.engine.query; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.hibernate.HibernateException; +import org.hibernate.QueryException; +import org.hibernate.ScrollableResults; +import org.hibernate.engine.QueryParameters; +import org.hibernate.engine.RowSelection; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.event.EventSource; +import org.hibernate.hql.FilterTranslator; +import org.hibernate.hql.ParameterTranslations; import org.hibernate.hql.QuerySplitter; import org.hibernate.hql.QueryTranslator; -import org.hibernate.hql.ParameterTranslations; -import org.hibernate.hql.FilterTranslator; +import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; import org.hibernate.util.EmptyIterator; +import org.hibernate.util.IdentitySet; import org.hibernate.util.JoinedIterator; -import org.hibernate.util.IdentitySet; -import org.hibernate.HibernateException; -import org.hibernate.ScrollableResults; -import org.hibernate.QueryException; -import org.hibernate.type.Type; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.engine.QueryParameters; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.RowSelection; -import org.hibernate.event.EventSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Serializable; -import java.util.Map; -import java.util.Set; -import java.util.HashSet; -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.HashMap; - /** * Defines a query execution plan for an HQL query (or filter). * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/NamedParameterDescriptor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/NamedParameterDescriptor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/NamedParameterDescriptor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.engine.query; +import java.io.Serializable; + import org.hibernate.type.Type; -import java.io.Serializable; - /** * Descriptor regarding a named parameter. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,21 +31,21 @@ import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.QueryException; -import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; import org.hibernate.action.BulkOperationCleanupAction; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.TypedValue; +import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; import org.hibernate.event.EventSource; import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.loader.custom.sql.SQLCustomQuery; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines a query execution plan for a native-SQL query. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/OrdinalParameterDescriptor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/OrdinalParameterDescriptor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/OrdinalParameterDescriptor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.engine.query; +import java.io.Serializable; + import org.hibernate.type.Type; -import java.io.Serializable; - /** * @author Steve Ebersole */ Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ParamLocationRecognizer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ParamLocationRecognizer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ParamLocationRecognizer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,13 +24,13 @@ */ package org.hibernate.engine.query; -import org.hibernate.util.ArrayHelper; - -import java.util.Map; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; +import java.util.Map; +import org.hibernate.util.ArrayHelper; + /** * Implements a parameter parser recognizer specifically for the purpose * of journaling parameter locations. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryMetadata.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryMetadata.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryMetadata.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.engine.query; -import org.hibernate.type.Type; - import java.io.Serializable; import java.util.Set; +import org.hibernate.type.Type; + /** * Defines metadata regarding a translated HQL or native-SQL query. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,27 +24,26 @@ */ package org.hibernate.engine.query; -import org.hibernate.util.SimpleMRUCache; -import org.hibernate.util.SoftLimitMRUCache; -import org.hibernate.util.CollectionHelper; +import java.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import org.hibernate.MappingException; +import org.hibernate.QueryException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; -import org.hibernate.QueryException; -import org.hibernate.MappingException; import org.hibernate.impl.FilterImpl; - +import org.hibernate.util.CollectionHelper; +import org.hibernate.util.SimpleMRUCache; +import org.hibernate.util.SoftLimitMRUCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Serializable; -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Set; -import java.util.HashSet; -import java.util.Collections; -import java.util.Collection; - /** * Acts as a cache for compiled query plans, as well as query-parameter metadata. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ReturnMetadata.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ReturnMetadata.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/ReturnMetadata.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.engine.query; +import java.io.Serializable; + import org.hibernate.type.Type; -import java.io.Serializable; - /** * @author Steve Ebersole */ Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQuerySpecification.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQuerySpecification.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQuerySpecification.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.engine.query.sql; -import org.hibernate.util.ArrayHelper; - -import java.util.Set; +import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; -import java.util.Arrays; -import java.util.Collections; +import java.util.Set; +import org.hibernate.util.ArrayHelper; + /** * Defines the specification or blue-print for a native-sql query. * Essentially a simple struct containing the information needed to "translate" Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/transaction/IsolatedWork.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/transaction/IsolatedWork.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/transaction/IsolatedWork.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.engine.transaction; +import java.sql.Connection; + import org.hibernate.HibernateException; -import java.sql.Connection; - /** * Represents work that needs to be performed in a manner * which isolates it from any current application unit of Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/transaction/Isolater.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/transaction/Isolater.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/transaction/Isolater.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,14 +26,15 @@ import java.sql.Connection; import java.sql.SQLException; + import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.exception.JDBCExceptionHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Class which provides the isolation semantics required by Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/AutoFlushEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/AutoFlushEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/AutoFlushEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.event; +import java.io.Serializable; + import org.hibernate.HibernateException; -import java.io.Serializable; - /** * Defines the contract for handling of session auto-flush events. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/DeleteEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/DeleteEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/DeleteEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.event; -import org.hibernate.HibernateException; - import java.io.Serializable; import java.util.Set; +import org.hibernate.HibernateException; + /** * Defines the contract for handling of deletion events generated from a session. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/DirtyCheckEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/DirtyCheckEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/DirtyCheckEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.event; +import java.io.Serializable; + import org.hibernate.HibernateException; -import java.io.Serializable; - /** * Defines the contract for handling of session dirty-check events. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/EventListeners.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/EventListeners.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/EventListeners.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,8 +30,8 @@ import java.util.HashMap; import java.util.Map; +import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; import org.hibernate.event.def.DefaultAutoFlushEventListener; import org.hibernate.event.def.DefaultDeleteEventListener; @@ -44,6 +44,7 @@ import org.hibernate.event.def.DefaultLockEventListener; import org.hibernate.event.def.DefaultMergeEventListener; import org.hibernate.event.def.DefaultPersistEventListener; +import org.hibernate.event.def.DefaultPersistOnFlushEventListener; import org.hibernate.event.def.DefaultPostLoadEventListener; import org.hibernate.event.def.DefaultPreLoadEventListener; import org.hibernate.event.def.DefaultRefreshEventListener; @@ -52,7 +53,6 @@ import org.hibernate.event.def.DefaultSaveOrUpdateCopyEventListener; import org.hibernate.event.def.DefaultSaveOrUpdateEventListener; import org.hibernate.event.def.DefaultUpdateEventListener; -import org.hibernate.event.def.DefaultPersistOnFlushEventListener; import org.hibernate.util.Cloneable; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/EvictEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/EvictEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/EvictEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.event; +import java.io.Serializable; + import org.hibernate.HibernateException; -import java.io.Serializable; - /** * Defines the contract for handling of evict events generated from a session. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/FlushEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/FlushEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/FlushEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.event; +import java.io.Serializable; + import org.hibernate.HibernateException; -import java.io.Serializable; - /** * Defines the contract for handling of session flush events. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/InitializeCollectionEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/InitializeCollectionEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/InitializeCollectionEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.event; +import java.io.Serializable; + import org.hibernate.HibernateException; -import java.io.Serializable; - /** * Defines the contract for handling of collection initialization events * generated by a session. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/LoadEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/LoadEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/LoadEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.event; +import java.io.Serializable; + import org.hibernate.HibernateException; -import java.io.Serializable; - /** * Defines the contract for handling of load events generated from a session. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/LockEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/LockEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/LockEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.event; +import java.io.Serializable; + import org.hibernate.HibernateException; -import java.io.Serializable; - /** * Defines the contract for handling of lock events generated from a session. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/RefreshEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/RefreshEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/RefreshEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.event; -import org.hibernate.HibernateException; - import java.io.Serializable; import java.util.Map; +import org.hibernate.HibernateException; + /** * Defines the contract for handling of refresh events generated from a session. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/ReplicateEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/ReplicateEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/ReplicateEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.event; +import java.io.Serializable; + import org.hibernate.HibernateException; -import java.io.Serializable; - /** * Defines the contract for handling of replicate events generated from a session. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,6 @@ import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.action.CollectionRecreateAction; import org.hibernate.action.CollectionRemoveAction; @@ -44,16 +42,18 @@ import org.hibernate.engine.Collections; import org.hibernate.engine.EntityEntry; import org.hibernate.engine.PersistenceContext; +import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.Status; import org.hibernate.event.EventSource; import org.hibernate.event.FlushEntityEvent; import org.hibernate.event.FlushEntityEventListener; import org.hibernate.event.FlushEvent; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.Printer; import org.hibernate.util.IdentityMap; import org.hibernate.util.LazyIterator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A convenience base class for listeners whose functionality results in flushing. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,18 +24,17 @@ */ package org.hibernate.event.def; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.LockMode; import org.hibernate.ObjectDeletedException; import org.hibernate.cache.CacheKey; import org.hibernate.cache.access.SoftLock; import org.hibernate.engine.EntityEntry; -import org.hibernate.engine.Status; import org.hibernate.engine.SessionImplementor; +import org.hibernate.engine.Status; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A convenience base class for listeners that respond to requests to perform a Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,9 +26,6 @@ import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.LockMode; import org.hibernate.engine.EntityEntry; import org.hibernate.engine.EntityKey; @@ -39,6 +36,8 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.TypeFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A convenience base class for listeners that respond to requests to reassociate an entity Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,9 +27,6 @@ import java.io.Serializable; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.LockMode; import org.hibernate.NonUniqueObjectException; import org.hibernate.action.EntityIdentityInsertAction; @@ -54,6 +51,8 @@ import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A convenience bas class for listeners responding to save events. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,13 +24,13 @@ */ package org.hibernate.event.def; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.event.AutoFlushEvent; import org.hibernate.event.AutoFlushEventListener; import org.hibernate.event.EventSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines the default flush event listeners used by hibernate for Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,14 +27,10 @@ import java.io.Serializable; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.CacheMode; import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.TransientObjectException; -import org.hibernate.util.IdentitySet; import org.hibernate.action.EntityDeleteAction; import org.hibernate.classic.Lifecycle; import org.hibernate.engine.Cascade; @@ -52,6 +48,9 @@ import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; +import org.hibernate.util.IdentitySet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines the default delete event listener used by hibernate for deleting entities Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,6 @@ import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.engine.Cascade; import org.hibernate.engine.CascadingAction; @@ -41,6 +39,8 @@ import org.hibernate.pretty.MessageHelper; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines the default evict event listener used by hibernate for evicting entities Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,14 +26,12 @@ import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.StaleObjectStateException; +import org.hibernate.action.DelayedPostInsertIdentifier; import org.hibernate.action.EntityUpdateAction; -import org.hibernate.action.DelayedPostInsertIdentifier; import org.hibernate.classic.Validatable; import org.hibernate.engine.EntityEntry; import org.hibernate.engine.EntityKey; @@ -49,6 +47,8 @@ import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An event that occurs for each entity instance at flush time Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,6 @@ import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.cache.CacheKey; import org.hibernate.cache.entry.CollectionCacheEntry; @@ -35,11 +33,13 @@ import org.hibernate.engine.CollectionEntry; import org.hibernate.engine.PersistenceContext; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; import org.hibernate.event.InitializeCollectionEvent; import org.hibernate.event.InitializeCollectionEventListener; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Gavin King Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,14 +26,12 @@ import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.NonUniqueObjectException; import org.hibernate.PersistentObjectException; import org.hibernate.TypeMismatchException; -import org.hibernate.EntityMode; import org.hibernate.cache.CacheKey; import org.hibernate.cache.access.SoftLock; import org.hibernate.cache.entry.CacheEntry; @@ -56,6 +54,8 @@ import org.hibernate.proxy.LazyInitializer; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines the default load event listeners used by hibernate for loading entities Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultLockEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultLockEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultLockEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -33,10 +33,10 @@ import org.hibernate.engine.CascadingAction; import org.hibernate.engine.EntityEntry; import org.hibernate.engine.ForeignKeys; +import org.hibernate.engine.SessionImplementor; import org.hibernate.event.EventSource; import org.hibernate.event.LockEvent; import org.hibernate.event.LockEventListener; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.entity.EntityPersister; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,21 +25,18 @@ package org.hibernate.event.def; import java.io.Serializable; +import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.HashSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.ObjectDeletedException; +import org.hibernate.PropertyValueException; import org.hibernate.StaleObjectStateException; import org.hibernate.TransientObjectException; import org.hibernate.WrongClassException; -import org.hibernate.PropertyValueException; import org.hibernate.engine.Cascade; import org.hibernate.engine.CascadingAction; import org.hibernate.engine.EntityEntry; @@ -55,8 +52,10 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; import org.hibernate.type.ForeignKeyDirection; -import org.hibernate.type.TypeFactory; import org.hibernate.type.Type; +import org.hibernate.type.TypeFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines the default copy event listener used by hibernate for copying entities Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,20 +26,20 @@ import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.ObjectDeletedException; import org.hibernate.PersistentObjectException; import org.hibernate.engine.CascadingAction; +import org.hibernate.engine.SessionImplementor; import org.hibernate.event.EventSource; import org.hibernate.event.PersistEvent; import org.hibernate.event.PersistEventListener; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; import org.hibernate.util.IdentityMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines the default create event listener used by hibernate for creating Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,8 +27,6 @@ import java.io.Serializable; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.PersistentObjectException; import org.hibernate.UnresolvableObjectException; @@ -47,6 +45,8 @@ import org.hibernate.type.CollectionType; import org.hibernate.type.Type; import org.hibernate.util.IdentityMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines the default refresh event listener used by hibernate for refreshing entities Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,24 +24,23 @@ */ package org.hibernate.event.def; +import java.io.Serializable; + import org.hibernate.HibernateException; -import org.hibernate.TransientObjectException; -import org.hibernate.ReplicationMode; import org.hibernate.LockMode; +import org.hibernate.ReplicationMode; +import org.hibernate.TransientObjectException; import org.hibernate.engine.Cascade; import org.hibernate.engine.CascadingAction; import org.hibernate.engine.EntityKey; +import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.Status; import org.hibernate.event.EventSource; import org.hibernate.event.ReplicateEvent; import org.hibernate.event.ReplicateEventListener; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; - -import java.io.Serializable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultSaveEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultSaveEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultSaveEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,9 +29,9 @@ import org.hibernate.Hibernate; import org.hibernate.PersistentObjectException; import org.hibernate.engine.EntityEntry; +import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.Status; import org.hibernate.event.SaveOrUpdateEvent; -import org.hibernate.engine.SessionImplementor; /** * An event handler for save() events Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,9 +26,6 @@ import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.HibernateException; @@ -49,6 +46,8 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.proxy.HibernateProxy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines the default listener used by Hibernate for handling save-update Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultUpdateEventListener.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultUpdateEventListener.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/DefaultUpdateEventListener.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,9 +26,9 @@ import java.io.Serializable; +import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.ObjectDeletedException; -import org.hibernate.EntityMode; import org.hibernate.engine.EntityEntry; import org.hibernate.engine.Status; import org.hibernate.event.SaveOrUpdateEvent; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/EventCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/EventCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/EventCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,13 +25,13 @@ */ package org.hibernate.event.def; +import java.util.Collection; +import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.Iterator; -import java.util.Collection; +import org.hibernate.AssertionFailure; import org.hibernate.util.IdentityMap; -import org.hibernate.AssertionFailure; /** * EventCache is a Map implementation that can be used by an event Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/EvictVisitor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/EvictVisitor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/EvictVisitor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,6 @@ */ package org.hibernate.event.def; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.CollectionEntry; @@ -33,6 +31,8 @@ import org.hibernate.event.EventSource; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.CollectionType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Evict any collections referenced by the object from the session cache. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/ReattachVisitor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/ReattachVisitor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/ReattachVisitor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,6 @@ import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.action.CollectionRemoveAction; import org.hibernate.event.EventSource; @@ -35,6 +33,8 @@ import org.hibernate.pretty.MessageHelper; import org.hibernate.type.AbstractComponentType; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract superclass of visitors that reattach collections. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/WrapVisitor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/WrapVisitor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/event/def/WrapVisitor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,6 @@ */ package org.hibernate.event.def; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.collection.PersistentCollection; @@ -37,6 +35,8 @@ import org.hibernate.type.AbstractComponentType; import org.hibernate.type.CollectionType; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Wrap collections in a Hibernate collection Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/CacheSQLStateConverter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/CacheSQLStateConverter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/CacheSQLStateConverter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.exception; -import org.hibernate.JDBCException; - import java.sql.SQLException; import java.util.HashSet; import java.util.Set; +import org.hibernate.JDBCException; + /** * A SQLExceptionConverter implementation specific to Cach&eacute; SQL, * accounting for its custom integrity constraint violation error codes. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/Configurable.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/Configurable.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/Configurable.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.exception; +import java.util.Properties; + import org.hibernate.HibernateException; -import java.util.Properties; - /** * The Configurable interface defines the contract for SQLExceptionConverter impls that * want to be configured prior to usage given the currently defined Hibernate properties. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/ConstraintViolationException.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/ConstraintViolationException.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/ConstraintViolationException.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.exception; +import java.sql.SQLException; + import org.hibernate.JDBCException; -import java.sql.SQLException; - /** * Implementation of JDBCException indicating that the requested DML operation * resulted in a violation of a defined integrity constraint. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/DataException.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/DataException.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/DataException.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.exception; +import java.sql.SQLException; + import org.hibernate.JDBCException; -import java.sql.SQLException; - /** * Implementation of JDBCException indicating that evaluation of the * valid SQL statement against the given data resulted in some Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/GenericJDBCException.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/GenericJDBCException.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/GenericJDBCException.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.exception; +import java.sql.SQLException; + import org.hibernate.JDBCException; -import java.sql.SQLException; - /** * Generic, non-specific JDBCException. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/JDBCConnectionException.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/JDBCConnectionException.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/JDBCConnectionException.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.exception; +import java.sql.SQLException; + import org.hibernate.JDBCException; -import java.sql.SQLException; - /** * Implementation of JDBCException indicating problems with communicating with the * database (can also include incorrect JDBC setup). Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/JDBCExceptionHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/JDBCExceptionHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/JDBCExceptionHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.exception; +import java.sql.SQLException; + import org.hibernate.JDBCException; import org.hibernate.util.JDBCExceptionReporter; -import java.sql.SQLException; - /** * Implementation of JDBCExceptionHelper. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/LockAcquisitionException.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/LockAcquisitionException.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/LockAcquisitionException.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.exception; +import java.sql.SQLException; + import org.hibernate.JDBCException; -import java.sql.SQLException; - /** * Implementation of JDBCException indicating a problem acquiring lock * on the database. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLExceptionConverter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLExceptionConverter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLExceptionConverter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.exception; +import java.sql.SQLException; + import org.hibernate.JDBCException; -import java.sql.SQLException; - /** * Defines a contract for implementations that know how to convert a SQLException * into Hibernate's JDBCException hierarchy. Inspired by Spring's Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,19 +24,19 @@ */ package org.hibernate.exception; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.lang.reflect.Constructor; +import java.sql.SQLException; +import java.util.Properties; + import org.hibernate.HibernateException; import org.hibernate.JDBCException; import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import java.lang.reflect.Constructor; -import java.sql.SQLException; -import java.util.Properties; - /** * A factory for building SQLExceptionConverter instances. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLGrammarException.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLGrammarException.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLGrammarException.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.exception; +import java.sql.SQLException; + import org.hibernate.JDBCException; -import java.sql.SQLException; - /** * Implementation of JDBCException indicating that the SQL sent to the database * server was invalid (syntax error, invalid object references, etc). Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLStateConverter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLStateConverter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/exception/SQLStateConverter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.exception; -import org.hibernate.JDBCException; - import java.sql.SQLException; import java.util.HashSet; import java.util.Set; +import org.hibernate.JDBCException; + /** * A SQLExceptionConverter implementation which performs converion based on * the underlying SQLState. Interpretation of a SQL error based on SQLState Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/CollectionProperties.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/CollectionProperties.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/CollectionProperties.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.hql; -import org.hibernate.persister.collection.CollectionPropertyNames; - import java.util.HashMap; import java.util.Map; +import org.hibernate.persister.collection.CollectionPropertyNames; + /** * Provides a map of collection function names to the corresponding property names. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.hql; +import java.util.Map; + +import org.hibernate.MappingException; +import org.hibernate.QueryException; import org.hibernate.engine.JoinSequence; import org.hibernate.sql.JoinFragment; -import org.hibernate.MappingException; -import org.hibernate.QueryException; import org.hibernate.util.StringHelper; -import java.util.Map; - /** * Provides the SQL for collection subqueries. * <br> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/FilterTranslator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/FilterTranslator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/FilterTranslator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.hql; +import java.util.Map; + import org.hibernate.MappingException; import org.hibernate.QueryException; -import java.util.Map; - /** * Specialized interface for filters. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ParameterTranslations.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ParameterTranslations.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ParameterTranslations.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,10 @@ */ package org.hibernate.hql; -import org.hibernate.type.Type; import java.util.Set; +import org.hibernate.type.Type; + /** * Defines available information about the parameters encountered during * query translation. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QuerySplitter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QuerySplitter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QuerySplitter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,17 +24,17 @@ */ package org.hibernate.hql; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; + import org.hibernate.MappingException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.classic.ParserHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; - /** * Provides query splitting methods, which were originally in QueryTranslator. * <br> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,6 +24,11 @@ */ package org.hibernate.hql; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.QueryException; @@ -33,11 +38,6 @@ import org.hibernate.event.EventSource; import org.hibernate.type.Type; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Defines the contract of an HQL->SQL translator. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.hql; +import java.util.Map; + import org.hibernate.engine.SessionFactoryImplementor; -import java.util.Map; - /** * Facade for generation of {@link QueryTranslator} and {@link FilterTranslator} instances. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,15 +24,15 @@ */ package org.hibernate.hql.ast; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.Map; + import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.FilterTranslator; import org.hibernate.hql.QueryTranslator; import org.hibernate.hql.QueryTranslatorFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import java.util.Map; - /** * Generates translators which uses the Antlr-based parser to perform * the translation. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.hql.ast; -import antlr.SemanticException; - import java.io.PrintStream; import java.io.PrintWriter; +import antlr.SemanticException; + /** * Thrown when a call to the underlying Hibernate engine fails, indicating * some form of semantic exception (e.g. a class name was not found in the Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,15 +24,16 @@ */ package org.hibernate.hql.ast; -import antlr.RecognitionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.hibernate.QueryException; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.hibernate.QueryException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import antlr.RecognitionException; + /** * An error handler that counts parsing errors and warnings. */ Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,10 @@ */ package org.hibernate.hql.ast; -import antlr.ASTFactory; import org.hibernate.hql.ast.tree.Node; +import antlr.ASTFactory; + /** * User: Joshua Davis<br> * Date: Sep 23, 2005<br> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlLexer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlLexer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlLexer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,10 +27,11 @@ import java.io.InputStream; import java.io.Reader; -import antlr.Token; import org.hibernate.QueryException; import org.hibernate.hql.antlr.HqlBaseLexer; +import antlr.Token; + /** * Custom lexer for the HQL grammar. Extends the base lexer generated by ANTLR * in order to keep the grammar source file clean. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlParser.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlParser.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlParser.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,6 +28,14 @@ import java.io.PrintWriter; import java.io.StringReader; +import org.hibernate.QueryException; +import org.hibernate.hql.antlr.HqlBaseParser; +import org.hibernate.hql.antlr.HqlTokenTypes; +import org.hibernate.hql.ast.util.ASTPrinter; +import org.hibernate.hql.ast.util.ASTUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import antlr.ASTPair; import antlr.MismatchedTokenException; import antlr.RecognitionException; @@ -35,13 +43,6 @@ import antlr.TokenStream; import antlr.TokenStreamException; import antlr.collections.AST; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.hibernate.hql.antlr.HqlBaseParser; -import org.hibernate.hql.antlr.HqlTokenTypes; -import org.hibernate.hql.ast.util.ASTPrinter; -import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.QueryException; /** * Implements the semantic action methods defined in the HQL base parser to keep the grammar Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -34,10 +34,8 @@ import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.hibernate.HibernateException; import org.hibernate.QueryException; -import org.hibernate.HibernateException; import org.hibernate.engine.JoinSequence; import org.hibernate.engine.ParameterBinder; import org.hibernate.engine.SessionFactoryImplementor; @@ -59,6 +57,8 @@ import org.hibernate.hql.ast.tree.InsertStatement; import org.hibernate.hql.ast.tree.IntoClause; import org.hibernate.hql.ast.tree.MethodNode; +import org.hibernate.hql.ast.tree.OperatorNode; +import org.hibernate.hql.ast.tree.ParameterContainer; import org.hibernate.hql.ast.tree.ParameterNode; import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.hql.ast.tree.ResolvableNode; @@ -66,34 +66,34 @@ import org.hibernate.hql.ast.tree.SelectClause; import org.hibernate.hql.ast.tree.SelectExpression; import org.hibernate.hql.ast.tree.UpdateStatement; -import org.hibernate.hql.ast.tree.OperatorNode; -import org.hibernate.hql.ast.tree.ParameterContainer; import org.hibernate.hql.ast.util.ASTPrinter; import org.hibernate.hql.ast.util.ASTUtil; import org.hibernate.hql.ast.util.AliasGenerator; import org.hibernate.hql.ast.util.JoinProcessor; import org.hibernate.hql.ast.util.LiteralProcessor; +import org.hibernate.hql.ast.util.NodeTraverser; import org.hibernate.hql.ast.util.SessionFactoryHelper; import org.hibernate.hql.ast.util.SyntheticAndFactory; -import org.hibernate.hql.ast.util.NodeTraverser; import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.PostInsertIdentifierGenerator; import org.hibernate.id.SequenceGenerator; +import org.hibernate.param.CollectionFilterKeyParameterSpecification; import org.hibernate.param.NamedParameterSpecification; import org.hibernate.param.ParameterSpecification; import org.hibernate.param.PositionalParameterSpecification; import org.hibernate.param.VersionTypeSeedParameterSpecification; -import org.hibernate.param.CollectionFilterKeyParameterSpecification; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.JoinFragment; import org.hibernate.type.AssociationType; +import org.hibernate.type.DbTimestampType; import org.hibernate.type.Type; import org.hibernate.type.VersionType; -import org.hibernate.type.DbTimestampType; import org.hibernate.usertype.UserVersionType; import org.hibernate.util.ArrayHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import antlr.ASTFactory; import antlr.RecognitionException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,21 +24,21 @@ */ package org.hibernate.hql.ast; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.hibernate.hql.ParameterTranslations; -import org.hibernate.type.Type; +import org.hibernate.param.NamedParameterSpecification; import org.hibernate.param.ParameterSpecification; import org.hibernate.param.PositionalParameterSpecification; -import org.hibernate.param.NamedParameterSpecification; +import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; -import java.util.Map; -import java.util.Set; -import java.util.List; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.io.Serializable; - /** * Defines the information available for parameters encountered during * query translation through the antlr-based parser. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,10 @@ */ package org.hibernate.hql.ast; -import antlr.RecognitionException; import org.hibernate.QueryException; +import antlr.RecognitionException; + /** * Exception thrown when there is a syntax error in the HQL. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,13 @@ */ package org.hibernate.hql.ast; -import antlr.ANTLRException; -import antlr.RecognitionException; -import antlr.TokenStreamException; -import antlr.collections.AST; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.QueryException; @@ -40,8 +41,8 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.event.EventSource; import org.hibernate.hql.FilterTranslator; +import org.hibernate.hql.ParameterTranslations; import org.hibernate.hql.QueryExecutionRequestException; -import org.hibernate.hql.ParameterTranslations; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.antlr.HqlTokenTypes; import org.hibernate.hql.antlr.SqlTokenTypes; @@ -54,21 +55,21 @@ import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.hql.ast.tree.Statement; import org.hibernate.hql.ast.util.ASTPrinter; +import org.hibernate.hql.ast.util.ASTUtil; import org.hibernate.hql.ast.util.NodeTraverser; -import org.hibernate.hql.ast.util.ASTUtil; import org.hibernate.loader.hql.QueryLoader; import org.hibernate.persister.entity.Queryable; import org.hibernate.type.Type; import org.hibernate.util.IdentitySet; +import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; -import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.ArrayList; +import antlr.ANTLRException; +import antlr.RecognitionException; +import antlr.TokenStreamException; +import antlr.collections.AST; /** * A QueryTranslator that uses an Antlr-based parser. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,13 +24,14 @@ */ package org.hibernate.hql.ast; -import antlr.ASTFactory; -import antlr.Token; -import antlr.collections.AST; +import java.lang.reflect.Constructor; + import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.tree.AggregateNode; +import org.hibernate.hql.ast.tree.BetweenOperatorNode; import org.hibernate.hql.ast.tree.BinaryArithmeticOperatorNode; import org.hibernate.hql.ast.tree.BinaryLogicOperatorNode; +import org.hibernate.hql.ast.tree.BooleanLiteralNode; import org.hibernate.hql.ast.tree.Case2Node; import org.hibernate.hql.ast.tree.CaseNode; import org.hibernate.hql.ast.tree.CollectionFunction; @@ -42,10 +43,14 @@ import org.hibernate.hql.ast.tree.FromElement; import org.hibernate.hql.ast.tree.IdentNode; import org.hibernate.hql.ast.tree.ImpliedFromElement; +import org.hibernate.hql.ast.tree.InLogicOperatorNode; import org.hibernate.hql.ast.tree.IndexNode; import org.hibernate.hql.ast.tree.InitializeableNode; import org.hibernate.hql.ast.tree.InsertStatement; import org.hibernate.hql.ast.tree.IntoClause; +import org.hibernate.hql.ast.tree.IsNotNullLogicOperatorNode; +import org.hibernate.hql.ast.tree.IsNullLogicOperatorNode; +import org.hibernate.hql.ast.tree.JavaConstantNode; import org.hibernate.hql.ast.tree.LiteralNode; import org.hibernate.hql.ast.tree.MethodNode; import org.hibernate.hql.ast.tree.OrderByClause; @@ -53,20 +58,16 @@ import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.hql.ast.tree.SelectClause; import org.hibernate.hql.ast.tree.SelectExpressionImpl; +import org.hibernate.hql.ast.tree.SessionFactoryAwareNode; import org.hibernate.hql.ast.tree.SqlFragment; import org.hibernate.hql.ast.tree.SqlNode; import org.hibernate.hql.ast.tree.UnaryArithmeticNode; +import org.hibernate.hql.ast.tree.UnaryLogicOperatorNode; import org.hibernate.hql.ast.tree.UpdateStatement; -import org.hibernate.hql.ast.tree.BetweenOperatorNode; -import org.hibernate.hql.ast.tree.UnaryLogicOperatorNode; -import org.hibernate.hql.ast.tree.InLogicOperatorNode; -import org.hibernate.hql.ast.tree.JavaConstantNode; -import org.hibernate.hql.ast.tree.SessionFactoryAwareNode; -import org.hibernate.hql.ast.tree.BooleanLiteralNode; -import org.hibernate.hql.ast.tree.IsNullLogicOperatorNode; -import org.hibernate.hql.ast.tree.IsNotNullLogicOperatorNode; -import java.lang.reflect.Constructor; +import antlr.ASTFactory; +import antlr.Token; +import antlr.collections.AST; /** * Custom AST factory the intermediate tree that causes ANTLR to create specialized Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,29 +25,29 @@ package org.hibernate.hql.ast; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import java.util.Arrays; -import antlr.RecognitionException; -import antlr.collections.AST; import org.hibernate.QueryException; -import org.hibernate.util.StringHelper; -import org.hibernate.param.ParameterSpecification; import org.hibernate.dialect.function.SQLFunction; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.antlr.SqlGeneratorBase; import org.hibernate.hql.antlr.SqlTokenTypes; +import org.hibernate.hql.ast.tree.FromElement; import org.hibernate.hql.ast.tree.MethodNode; -import org.hibernate.hql.ast.tree.FromElement; import org.hibernate.hql.ast.tree.Node; +import org.hibernate.hql.ast.tree.ParameterContainer; import org.hibernate.hql.ast.tree.ParameterNode; -import org.hibernate.hql.ast.tree.ParameterContainer; import org.hibernate.hql.ast.util.ASTPrinter; - +import org.hibernate.param.ParameterSpecification; +import org.hibernate.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import antlr.RecognitionException; +import antlr.collections.AST; + /** * Generates SQL by overriding callback methods in the base class, which does * the actual SQL AST walking. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,19 +24,18 @@ */ package org.hibernate.hql.ast.exec; -import java.sql.PreparedStatement; import java.sql.Connection; +import java.sql.PreparedStatement; import java.sql.Statement; -import java.util.List; -import java.util.Iterator; import java.util.Collections; +import java.util.List; import org.hibernate.HibernateException; import org.hibernate.action.BulkOperationCleanupAction; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.transaction.Isolater; import org.hibernate.engine.transaction.IsolatedWork; +import org.hibernate.engine.transaction.Isolater; import org.hibernate.event.EventSource; import org.hibernate.hql.ast.HqlSqlWalker; import org.hibernate.hql.ast.SqlGenerator; @@ -45,12 +44,11 @@ import org.hibernate.sql.Select; import org.hibernate.sql.SelectFragment; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; import antlr.RecognitionException; import antlr.collections.AST; -import org.slf4j.Logger; - /** * Implementation of AbstractStatementExecutor. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -39,12 +39,11 @@ import org.hibernate.hql.ast.SqlGenerator; import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.entity.Queryable; - -import antlr.RecognitionException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import antlr.RecognitionException; + /** * Implementation of BasicExecutor. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -39,7 +39,6 @@ import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.Delete; import org.hibernate.util.StringHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -42,7 +42,6 @@ import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.Update; import org.hibernate.util.StringHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.hql.ast.tree; -import antlr.collections.AST; - -import org.hibernate.type.Type; +import org.hibernate.HibernateException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.type.Type; import org.hibernate.util.StringHelper; -import org.hibernate.HibernateException; +import antlr.collections.AST; + /** * Base class for nodes dealing 'is null' and 'is not null' operators. * <p/> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,11 +26,10 @@ import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.util.ASTUtil; +import org.slf4j.Logger; import antlr.collections.AST; -import org.slf4j.Logger; - /** * Convenience implementation of {@link RestrictableStatement} * to centralize common functionality. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.hql.ast.tree; +import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import java.util.HashSet; -import java.util.Collections; import org.hibernate.QueryException; import org.hibernate.engine.SessionFactoryImplementor; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,9 @@ */ package org.hibernate.hql.ast.tree; +import org.hibernate.Hibernate; import org.hibernate.type.Type; -import org.hibernate.Hibernate; + import antlr.SemanticException; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,9 +25,9 @@ package org.hibernate.hql.ast.tree; import org.hibernate.Hibernate; +import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.hql.ast.util.DisplayableNode; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.type.Type; import antlr.SemanticException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,15 +23,16 @@ */ package org.hibernate.hql.ast.tree; -import org.hibernate.type.OneToOneType; -import org.hibernate.type.Type; import org.hibernate.Hibernate; +import org.hibernate.HibernateException; import org.hibernate.TypeMismatchException; -import org.hibernate.HibernateException; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.param.ParameterSpecification; +import org.hibernate.type.OneToOneType; +import org.hibernate.type.Type; import org.hibernate.util.StringHelper; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.engine.SessionFactoryImplementor; + import antlr.SemanticException; import antlr.collections.AST; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.hql.ast.tree; -import org.hibernate.type.Type; -import org.hibernate.type.BooleanType; import org.hibernate.Hibernate; import org.hibernate.QueryException; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.type.BooleanType; +import org.hibernate.type.Type; /** * Represents a boolean literal within a query. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.hql.ast.tree; +import org.hibernate.hql.ast.util.DisplayableNode; + import antlr.SemanticException; import antlr.collections.AST; -import org.hibernate.hql.ast.util.DisplayableNode; - /** * Represents 'elements()' or 'indices()'. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,7 +26,6 @@ import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.antlr.SqlTokenTypes; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -37,13 +37,12 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import antlr.SemanticException; import antlr.collections.AST; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Represents a reference to a property or alias expression. This should duplicate the relevant behaviors in * PathExpressionParser. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,12 +32,12 @@ import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.util.ASTIterator; import org.hibernate.hql.ast.util.ASTUtil; import org.hibernate.hql.ast.util.DisplayableNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import antlr.SemanticException; import antlr.collections.AST; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,19 +24,19 @@ */ package org.hibernate.hql.ast.tree; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import java.util.ArrayList; import org.hibernate.QueryException; -import org.hibernate.param.ParameterSpecification; import org.hibernate.engine.JoinSequence; -import org.hibernate.hql.QueryTranslator; import org.hibernate.hql.CollectionProperties; +import org.hibernate.hql.QueryTranslator; import org.hibernate.hql.antlr.SqlTokenTypes; +import org.hibernate.hql.ast.HqlSqlWalker; import org.hibernate.hql.ast.util.ASTUtil; import org.hibernate.hql.ast.util.DisplayableNode; -import org.hibernate.hql.ast.HqlSqlWalker; +import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.PropertyMapping; @@ -44,7 +44,6 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -40,14 +40,13 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import antlr.ASTFactory; import antlr.SemanticException; import antlr.collections.AST; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Encapsulates the creation of FromElements and JoinSequences. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,13 +28,12 @@ import org.hibernate.MappingException; import org.hibernate.QueryException; -import org.hibernate.param.ParameterSpecification; -import org.hibernate.util.ArrayHelper; import org.hibernate.engine.JoinSequence; import org.hibernate.hql.CollectionProperties; import org.hibernate.hql.CollectionSubqueryFactory; import org.hibernate.hql.NameGenerator; import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.collection.CollectionPropertyMapping; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.EntityPersister; @@ -44,7 +43,7 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; - +import org.hibernate.util.ArrayHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.hql.ast.tree; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import antlr.SemanticException; import antlr.collections.AST; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Represents a reference to a FROM element, for example a class alias in a WHERE clause. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.hql.ast.tree; -import antlr.SemanticException; -import antlr.collections.AST; +import java.util.List; + import org.hibernate.QueryException; import org.hibernate.dialect.function.SQLFunction; import org.hibernate.hql.antlr.SqlTokenTypes; @@ -37,7 +37,8 @@ import org.hibernate.type.Type; import org.hibernate.util.StringHelper; -import java.util.List; +import antlr.SemanticException; +import antlr.collections.AST; /** * Represents an identifier all by itself, which may be a function name, Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,10 @@ */ package org.hibernate.hql.ast.tree; +import org.hibernate.type.Type; + import antlr.SemanticException; import antlr.collections.AST; -import org.hibernate.type.Type; /** * @author Steve Ebersole Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,29 +24,28 @@ */ package org.hibernate.hql.ast.tree; -import java.util.List; -import java.util.Iterator; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.Iterator; +import java.util.List; import org.hibernate.QueryException; -import org.hibernate.param.ParameterSpecification; import org.hibernate.engine.JoinSequence; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionImplementor; import org.hibernate.hql.ast.SqlGenerator; import org.hibernate.hql.ast.util.SessionFactoryHelper; +import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.CollectionType; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import antlr.RecognitionException; import antlr.SemanticException; import antlr.collections.AST; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Represents the [] operator and provides it's semantics. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.hql.ast.tree; +import java.sql.Types; import java.util.ArrayList; import java.util.List; -import java.sql.Types; import org.hibernate.QueryException; import org.hibernate.hql.ast.util.DisplayableNode; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,15 +24,15 @@ */ package org.hibernate.hql.ast.tree; +import org.hibernate.QueryException; +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.hql.QueryTranslator; +import org.hibernate.type.LiteralType; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; -import org.hibernate.type.LiteralType; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.dialect.Dialect; -import org.hibernate.QueryException; -import org.hibernate.hql.QueryTranslator; /** * A node representing a static Java constant. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -34,13 +34,12 @@ import org.hibernate.persister.collection.CollectionPropertyNames; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import antlr.SemanticException; import antlr.collections.AST; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Represents a method call. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/Node.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/Node.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/Node.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,12 @@ */ package org.hibernate.hql.ast.tree; -import antlr.collections.AST; -import antlr.Token; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.util.StringHelper; -import org.hibernate.engine.SessionFactoryImplementor; +import antlr.Token; +import antlr.collections.AST; + /** * Base node class for use by Hibernate within its AST trees. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,6 +25,7 @@ package org.hibernate.hql.ast.tree; import org.hibernate.type.Type; + import antlr.SemanticException; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.hql.ast.tree; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.hql.ast.util.DisplayableNode; import org.hibernate.param.ParameterSpecification; import org.hibernate.type.Type; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.hql.ast.util.DisplayableNode; /** * Implementation of ParameterNode. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,13 +29,12 @@ import org.hibernate.hql.ast.util.ASTUtil; import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import antlr.SemanticException; import antlr.collections.AST; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Defines a top-level AST node representing an HQL select statement. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,12 +29,12 @@ import java.util.Iterator; import java.util.List; +import org.hibernate.QueryException; import org.hibernate.hql.antlr.SqlTokenTypes; import org.hibernate.hql.ast.util.ASTAppender; import org.hibernate.hql.ast.util.ASTIterator; import org.hibernate.hql.ast.util.ASTPrinter; import org.hibernate.type.Type; -import org.hibernate.QueryException; import antlr.SemanticException; import antlr.collections.AST; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.hql.ast.tree; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; +import org.hibernate.param.ParameterSpecification; import org.hibernate.sql.JoinFragment; -import org.hibernate.param.ParameterSpecification; /** * Represents an SQL fragment in the AST. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.hql.ast.tree; +import org.hibernate.Hibernate; import org.hibernate.type.Type; -import org.hibernate.Hibernate; /** * Represents a unary operator node. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,12 +27,11 @@ import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.antlr.SqlTokenTypes; import org.hibernate.hql.ast.util.ASTUtil; - -import antlr.collections.AST; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import antlr.collections.AST; + /** * Defines a top-level AST node representing an HQL update statement. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,12 +23,12 @@ */ package org.hibernate.hql.ast.util; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import antlr.ASTFactory; import antlr.collections.AST; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,31 +25,30 @@ package org.hibernate.hql.ast.util; import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; -import java.util.ListIterator; import java.util.List; +import java.util.ListIterator; import java.util.StringTokenizer; -import java.util.Collection; import org.hibernate.AssertionFailure; import org.hibernate.dialect.Dialect; -import org.hibernate.impl.FilterImpl; -import org.hibernate.type.Type; -import org.hibernate.param.DynamicFilterParameterSpecification; import org.hibernate.engine.JoinSequence; import org.hibernate.engine.QueryParameters; import org.hibernate.hql.antlr.SqlTokenTypes; import org.hibernate.hql.ast.HqlSqlWalker; +import org.hibernate.hql.ast.tree.DotNode; import org.hibernate.hql.ast.tree.FromClause; import org.hibernate.hql.ast.tree.FromElement; -import org.hibernate.hql.ast.tree.QueryNode; -import org.hibernate.hql.ast.tree.DotNode; import org.hibernate.hql.ast.tree.ParameterContainer; +import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.hql.classic.ParserHelper; +import org.hibernate.impl.FilterImpl; +import org.hibernate.param.DynamicFilterParameterSpecification; import org.hibernate.sql.JoinFragment; -import org.hibernate.util.StringHelper; +import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; - +import org.hibernate.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,12 @@ */ package org.hibernate.hql.ast.util; +import java.math.BigDecimal; +import java.text.DecimalFormat; + +import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.QueryException; -import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.hql.QueryTranslator; import org.hibernate.hql.antlr.HqlSqlTokenTypes; @@ -42,16 +45,12 @@ import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import antlr.SemanticException; import antlr.collections.AST; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.math.BigDecimal; -import java.text.DecimalFormat; - /** * A delegate that handles literals and constants for HqlSqlWalker, performing the token replacement functions and * classifying literals. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,10 @@ */ package org.hibernate.hql.ast.util; -import antlr.collections.AST; import java.util.Stack; +import antlr.collections.AST; + /** * A visitor for traversing an AST tree. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,13 +26,12 @@ import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import antlr.ASTFactory; import antlr.collections.AST; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Provides utility methods for paths. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,23 +27,22 @@ import java.util.Map; import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.ast.HqlSqlWalker; import org.hibernate.hql.ast.tree.FromElement; +import org.hibernate.hql.ast.tree.Node; import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.hql.ast.tree.RestrictableStatement; import org.hibernate.hql.ast.tree.SqlFragment; -import org.hibernate.hql.ast.tree.Node; -import org.hibernate.hql.ast.HqlSqlWalker; +import org.hibernate.param.CollectionFilterKeyParameterSpecification; import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.JoinFragment; -import org.hibernate.util.StringHelper; import org.hibernate.type.Type; -import org.hibernate.param.CollectionFilterKeyParameterSpecification; - -import antlr.collections.AST; - +import org.hibernate.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import antlr.collections.AST; + /** * Creates synthetic and nodes based on the where fragment part of a JoinSequence. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,13 +24,13 @@ */ package org.hibernate.hql.classic; +import java.util.Map; + import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.FilterTranslator; import org.hibernate.hql.QueryTranslator; import org.hibernate.hql.QueryTranslatorFactory; -import java.util.Map; - /** * Generates translators which uses the older hand-written parser to perform * the translation. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ClauseParser.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ClauseParser.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ClauseParser.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.hql.classic; -import org.hibernate.QueryException; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.hibernate.QueryException; + /** * Parses the Hibernate query into its constituent clauses. */ Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/FromParser.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/FromParser.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/FromParser.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.hql.classic; +import java.util.HashMap; +import java.util.Map; + import org.hibernate.QueryException; import org.hibernate.hql.QueryTranslator; import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.JoinFragment; -import java.util.HashMap; -import java.util.Map; - /** * Parses the from clause of a hibernate query, looking for tables and * aliases for the SQL query. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ParserHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ParserHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/ParserHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.hql.classic; +import java.util.StringTokenizer; + import org.hibernate.QueryException; import org.hibernate.util.StringHelper; -import java.util.StringTokenizer; - public final class ParserHelper { public static final String HQL_VARIABLE_PREFIX = ":"; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.hql.classic; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.hibernate.QueryException; import org.hibernate.hql.CollectionProperties; import org.hibernate.util.StringHelper; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - /** * */ Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -38,9 +38,6 @@ import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.MappingException; @@ -74,6 +71,8 @@ import org.hibernate.util.ArrayHelper; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An instance of <tt>QueryTranslator</tt> translates a Hibernate Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/SelectParser.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/SelectParser.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/SelectParser.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,6 +24,11 @@ */ package org.hibernate.hql.classic; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + import org.hibernate.Hibernate; import org.hibernate.QueryException; import org.hibernate.dialect.function.SQLFunction; @@ -31,11 +36,6 @@ import org.hibernate.type.Type; import org.hibernate.util.ReflectHelper; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - /** * Parsers the select clause of a Hibernate query. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,6 +25,7 @@ package org.hibernate.id; import java.net.InetAddress; + import org.hibernate.util.BytesHelper; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/GUIDGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/GUIDGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/GUIDGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,11 +29,11 @@ import java.sql.ResultSet; import java.sql.SQLException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.exception.JDBCExceptionHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Generates <tt>string</tt> values using the SQL Server NEWID() function. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentifierGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentifierGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentifierGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.id; +import java.io.Serializable; + import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; -import java.io.Serializable; - /** * The general contract between a class that generates unique * identifiers and the <tt>Session</tt>. It is not intended that Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentifierGeneratorFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentifierGeneratorFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentifierGeneratorFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,14 +30,13 @@ import java.util.HashMap; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.type.Type; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Factory and helper methods for <tt>IdentifierGenerator</tt> framework. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentityGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentityGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IdentityGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,19 +25,19 @@ package org.hibernate.id; import java.io.Serializable; +import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.PreparedStatement; +import org.hibernate.AssertionFailure; +import org.hibernate.HibernateException; +import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; +import org.hibernate.id.insert.AbstractReturningDelegate; +import org.hibernate.id.insert.AbstractSelectingDelegate; +import org.hibernate.id.insert.IdentifierGeneratingInsert; import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; -import org.hibernate.id.insert.IdentifierGeneratingInsert; -import org.hibernate.id.insert.AbstractSelectingDelegate; -import org.hibernate.id.insert.AbstractReturningDelegate; import org.hibernate.id.insert.InsertSelectIdentityInsert; -import org.hibernate.dialect.Dialect; -import org.hibernate.HibernateException; -import org.hibernate.AssertionFailure; /** * A generator for use with ANSI-SQL IDENTITY columns used as the primary key. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IncrementGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IncrementGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/IncrementGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,8 +30,6 @@ import java.sql.SQLException; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; @@ -40,6 +38,8 @@ import org.hibernate.mapping.Table; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * <b>increment</b><br> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,18 +32,18 @@ import java.sql.Types; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.MappingException; -import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.TransactionHelper; +import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.mapping.Table; import org.hibernate.type.Type; import org.hibernate.util.PropertiesHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SelectGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SelectGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SelectGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,14 +30,14 @@ import java.sql.SQLException; import java.util.Properties; +import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.HibernateException; -import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; -import org.hibernate.id.insert.IdentifierGeneratingInsert; -import org.hibernate.id.insert.AbstractSelectingDelegate; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.ValueInclusion; +import org.hibernate.id.insert.AbstractSelectingDelegate; +import org.hibernate.id.insert.IdentifierGeneratingInsert; +import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; import org.hibernate.type.Type; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,16 +30,16 @@ import java.sql.SQLException; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; +import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.mapping.Table; import org.hibernate.type.Type; import org.hibernate.util.PropertiesHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * <b>sequence</b><br> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,14 +27,14 @@ import java.io.Serializable; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.type.Type; import org.hibernate.util.PropertiesHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * <b>seqhilo</b><br> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,23 +24,23 @@ */ package org.hibernate.id; -import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; +import java.io.Serializable; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.Properties; + +import org.hibernate.HibernateException; +import org.hibernate.MappingException; +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.SessionImplementor; import org.hibernate.id.insert.AbstractReturningDelegate; import org.hibernate.id.insert.IdentifierGeneratingInsert; -import org.hibernate.dialect.Dialect; -import org.hibernate.HibernateException; -import org.hibernate.MappingException; +import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; import org.hibernate.sql.Insert; import org.hibernate.type.Type; -import org.hibernate.engine.SessionImplementor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Serializable; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Properties; - /** * A generator which combines sequence generation with immediate retrieval * through JDBC3 {@link java.sql.Connection#prepareStatement(String, String[]) getGeneratedKeys}. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/TableGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/TableGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/TableGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,17 +32,17 @@ import java.sql.Types; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.LockMode; -import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.TransactionHelper; +import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.mapping.Table; import org.hibernate.type.Type; import org.hibernate.util.PropertiesHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An <tt>IdentifierGenerator</tt> that uses a database Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/TableHiLoGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/TableHiLoGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/TableHiLoGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,13 +27,13 @@ import java.io.Serializable; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.type.Type; import org.hibernate.util.PropertiesHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * <b>hilo</b><br> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.id.enhanced; +import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; -import org.hibernate.dialect.Dialect; /** * Encapsulates definition of the underlying data structure backing a Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,13 +27,12 @@ import java.io.Serializable; import java.lang.reflect.Constructor; +import org.hibernate.HibernateException; +import org.hibernate.id.IdentifierGeneratorFactory; +import org.hibernate.util.ReflectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.HibernateException; -import org.hibernate.util.ReflectHelper; -import org.hibernate.id.IdentifierGeneratorFactory; - /** * Factory for {@link Optimizer} instances. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,13 +28,12 @@ import java.sql.ResultSet; import java.sql.SQLException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.exception.JDBCExceptionHelper; -import org.hibernate.HibernateException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Describes a sequence. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,21 +24,20 @@ */ package org.hibernate.id.enhanced; -import java.util.Properties; import java.io.Serializable; +import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.hibernate.id.PersistentIdentifierGenerator; -import org.hibernate.id.Configurable; import org.hibernate.HibernateException; import org.hibernate.MappingException; +import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; +import org.hibernate.id.Configurable; +import org.hibernate.id.PersistentIdentifierGenerator; import org.hibernate.mapping.Table; -import org.hibernate.util.PropertiesHelper; import org.hibernate.type.Type; -import org.hibernate.dialect.Dialect; +import org.hibernate.util.PropertiesHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Generates identifier values based on an sequence-style database structure. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,33 +24,32 @@ */ package org.hibernate.id.enhanced; -import java.sql.Types; +import java.io.Serializable; import java.sql.Connection; -import java.sql.SQLException; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.util.Properties; -import java.util.HashMap; +import java.sql.SQLException; +import java.sql.Types; import java.util.Collections; +import java.util.HashMap; import java.util.Map; -import java.io.Serializable; +import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.hibernate.engine.TransactionHelper; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.id.PersistentIdentifierGenerator; -import org.hibernate.id.Configurable; -import org.hibernate.type.Type; -import org.hibernate.dialect.Dialect; import org.hibernate.HibernateException; -import org.hibernate.MappingException; import org.hibernate.LockMode; +import org.hibernate.MappingException; +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.engine.TransactionHelper; +import org.hibernate.id.Configurable; +import org.hibernate.id.PersistentIdentifierGenerator; import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.mapping.Table; +import org.hibernate.type.Type; import org.hibernate.util.PropertiesHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An enhanced version of table-based id generation. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/TableStructure.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/TableStructure.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/enhanced/TableStructure.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,9 +30,6 @@ import java.sql.SQLException; import java.sql.Types; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.dialect.Dialect; @@ -41,6 +38,8 @@ import org.hibernate.id.IdentifierGenerationException; import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.jdbc.util.SQLStatementLogger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Describes a table used to mimic sequence behavior Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,15 +24,15 @@ */ package org.hibernate.id.insert; -import org.hibernate.id.PostInsertIdentityPersister; +import java.io.Serializable; +import java.sql.PreparedStatement; +import java.sql.SQLException; + import org.hibernate.engine.SessionImplementor; import org.hibernate.exception.JDBCExceptionHelper; +import org.hibernate.id.PostInsertIdentityPersister; import org.hibernate.pretty.MessageHelper; -import java.io.Serializable; -import java.sql.PreparedStatement; -import java.sql.SQLException; - /** * Abstract InsertGeneratedIdentifierDelegate implementation where the * underlying strategy causes the enerated identitifer to be returned as an Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,16 @@ */ package org.hibernate.id.insert; +import java.io.Serializable; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.hibernate.engine.SessionImplementor; import org.hibernate.exception.JDBCExceptionHelper; +import org.hibernate.id.PostInsertIdentityPersister; import org.hibernate.pretty.MessageHelper; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.id.PostInsertIdentityPersister; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.ResultSet; -import java.io.Serializable; - /** * Abstract InsertGeneratedIdentifierDelegate implementation where the * underlying strategy requires an subsequent select after the insert Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/IdentifierGeneratingInsert.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/IdentifierGeneratingInsert.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/IdentifierGeneratingInsert.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.id.insert; +import org.hibernate.dialect.Dialect; import org.hibernate.sql.Insert; -import org.hibernate.dialect.Dialect; /** * Nothing more than a distinguishing subclass of Insert used to indicate Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.id.insert; +import java.io.Serializable; + import org.hibernate.engine.SessionImplementor; -import java.io.Serializable; - /** * Responsible for handling delegation relating to variants in how * insert-generated-identifier generator strategies dictate processing:<ul> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -36,9 +36,6 @@ import java.util.Locale; import java.util.TimeZone; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.MappingException; @@ -49,6 +46,8 @@ import org.hibernate.hql.HolderInstantiator; import org.hibernate.loader.Loader; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Implementation of the <tt>ScrollableResults</tt> interface Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/AbstractSessionImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/AbstractSessionImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/AbstractSessionImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,23 +24,23 @@ */ package org.hibernate.impl; +import java.util.List; + +import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.Query; import org.hibernate.SQLQuery; -import org.hibernate.HibernateException; import org.hibernate.ScrollableResults; import org.hibernate.SessionException; -import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; import org.hibernate.engine.NamedQueryDefinition; import org.hibernate.engine.NamedSQLQueryDefinition; -import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.query.HQLQueryPlan; import org.hibernate.engine.query.NativeSQLQueryPlan; +import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; -import java.util.List; - /** * Functionality common to stateless and stateful sessions * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/FetchingScrollableResultsImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/FetchingScrollableResultsImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/FetchingScrollableResultsImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,19 +24,19 @@ */ package org.hibernate.impl; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + import org.hibernate.HibernateException; import org.hibernate.MappingException; +import org.hibernate.engine.QueryParameters; +import org.hibernate.engine.SessionImplementor; import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.hql.HolderInstantiator; +import org.hibernate.loader.Loader; import org.hibernate.type.Type; -import org.hibernate.loader.Loader; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.QueryParameters; -import java.sql.ResultSet; -import java.sql.PreparedStatement; -import java.sql.SQLException; - /** * Implementation of ScrollableResults which can handle collection fetches. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/IteratorImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/IteratorImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/IteratorImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,6 @@ import java.sql.SQLException; import java.util.NoSuchElementException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.JDBCException; import org.hibernate.engine.HibernateIterator; @@ -39,6 +37,8 @@ import org.hibernate.hql.HolderInstantiator; import org.hibernate.type.EntityType; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An implementation of <tt>java.util.Iterator</tt> that is Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SQLQueryImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SQLQueryImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SQLQueryImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,33 +24,33 @@ */ package org.hibernate.impl; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.io.Serializable; import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.LockMode; +import org.hibernate.MappingException; import org.hibernate.Query; import org.hibernate.QueryException; import org.hibernate.SQLQuery; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; -import org.hibernate.MappingException; -import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; -import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.engine.NamedSQLQueryDefinition; import org.hibernate.engine.QueryParameters; +import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.query.ParameterMetadata; import org.hibernate.engine.query.sql.NativeSQLQueryJoinReturn; +import org.hibernate.engine.query.sql.NativeSQLQueryReturn; +import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn; import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; -import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn; -import org.hibernate.engine.query.sql.NativeSQLQueryReturn; +import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; import org.hibernate.type.Type; import org.hibernate.util.CollectionHelper; import org.hibernate.util.StringHelper; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/ScrollableResultsImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/ScrollableResultsImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/ScrollableResultsImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,6 +24,10 @@ */ package org.hibernate.impl; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.ScrollableResults; @@ -34,10 +38,6 @@ import org.hibernate.loader.Loader; import org.hibernate.type.Type; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - /** * Implementation of the <tt>ScrollableResults</tt> interface * @author Gavin King Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -43,7 +43,6 @@ import org.hibernate.SessionFactory; import org.hibernate.util.NamingHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -39,13 +39,11 @@ import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.CacheMode; import org.hibernate.ConnectionReleaseMode; import org.hibernate.Criteria; import org.hibernate.EntityMode; +import org.hibernate.EntityNameResolver; import org.hibernate.Filter; import org.hibernate.FlushMode; import org.hibernate.HibernateException; @@ -65,7 +63,6 @@ import org.hibernate.Transaction; import org.hibernate.TransientObjectException; import org.hibernate.UnresolvableObjectException; -import org.hibernate.EntityNameResolver; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.ActionQueue; import org.hibernate.engine.CollectionEntry; @@ -129,6 +126,8 @@ import org.hibernate.util.ArrayHelper; import org.hibernate.util.CollectionHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,6 @@ import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.CacheMode; import org.hibernate.ConnectionReleaseMode; import org.hibernate.Criteria; @@ -70,6 +68,8 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.type.Type; import org.hibernate.util.CollectionHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Gavin King Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/AbstractFieldInterceptor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/AbstractFieldInterceptor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/AbstractFieldInterceptor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.intercept; +import java.io.Serializable; +import java.util.Set; + +import org.hibernate.LazyInitializationException; import org.hibernate.engine.SessionImplementor; -import org.hibernate.LazyInitializationException; -import java.util.Set; -import java.io.Serializable; - /** * @author Steve Ebersole */ Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.intercept; +import java.util.Set; + import org.hibernate.engine.SessionImplementor; import org.hibernate.intercept.cglib.CGLIBHelper; import org.hibernate.intercept.javassist.JavassistHelper; -import java.util.Set; - /** * Helper class for dealing with enhanced entity classes. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,12 @@ */ package org.hibernate.intercept.cglib; -import org.hibernate.intercept.FieldInterceptor; -import org.hibernate.engine.SessionImplementor; +import java.util.Set; + import net.sf.cglib.transform.impl.InterceptFieldEnabled; -import java.util.Set; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.intercept.FieldInterceptor; /** * @author Steve Ebersole Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,8 @@ import net.sf.cglib.transform.impl.InterceptFieldCallback; +import org.hibernate.engine.SessionImplementor; import org.hibernate.intercept.AbstractFieldInterceptor; -import org.hibernate.engine.SessionImplementor; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/javassist/FieldInterceptorImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/javassist/FieldInterceptorImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/javassist/FieldInterceptorImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,8 +28,8 @@ import java.util.Set; import org.hibernate.bytecode.javassist.FieldHandler; +import org.hibernate.engine.SessionImplementor; import org.hibernate.intercept.AbstractFieldInterceptor; -import org.hibernate.engine.SessionImplementor; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/javassist/JavassistHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/javassist/JavassistHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/intercept/javassist/JavassistHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.intercept.javassist; +import java.util.Set; + +import org.hibernate.bytecode.javassist.FieldHandled; +import org.hibernate.engine.SessionImplementor; import org.hibernate.intercept.FieldInterceptor; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.bytecode.javassist.FieldHandled; -import java.util.Set; - /** * @author Steve Ebersole */ Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,13 +29,10 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.ConcurrentModificationException; import java.util.HashSet; import java.util.Iterator; -import java.util.ConcurrentModificationException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.Interceptor; @@ -47,6 +44,8 @@ import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.util.JDBCExceptionReporter; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Manages prepared statements and batching. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/BorrowedConnectionProxy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/BorrowedConnectionProxy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/BorrowedConnectionProxy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.jdbc; -import org.hibernate.HibernateException; - import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import java.lang.reflect.InvocationTargetException; import java.sql.Connection; +import org.hibernate.HibernateException; + /** * A proxy for <i>borrowed</i> connections which funnels all requests back * into the ConnectionManager from which it was borrowed to be properly Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/ConnectionManager.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/ConnectionManager.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/ConnectionManager.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,14 +31,14 @@ import java.sql.Connection; import java.sql.SQLException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.util.JDBCExceptionReporter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Encapsulates JDBC Connection management logic needed by Hibernate. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/Expectation.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/Expectation.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/Expectation.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.jdbc; +import java.sql.PreparedStatement; +import java.sql.SQLException; + import org.hibernate.HibernateException; -import java.sql.SQLException; -import java.sql.PreparedStatement; - /** * Defines an expected DML operation outcome. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/Expectations.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/Expectations.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/Expectations.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,19 +24,19 @@ */ package org.hibernate.jdbc; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Types; + +import org.hibernate.HibernateException; import org.hibernate.StaleStateException; -import org.hibernate.HibernateException; import org.hibernate.engine.ExecuteUpdateResultCheckStyle; +import org.hibernate.exception.GenericJDBCException; import org.hibernate.util.JDBCExceptionReporter; -import org.hibernate.exception.GenericJDBCException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import java.sql.CallableStatement; -import java.sql.SQLException; -import java.sql.PreparedStatement; -import java.sql.Types; - /** * Holds various often used {@link Expectation} definitions. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/JDBCContext.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/JDBCContext.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/JDBCContext.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,28 +24,28 @@ */ package org.hibernate.jdbc; -import java.io.Serializable; -import java.io.ObjectOutputStream; import java.io.IOException; import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; import java.sql.Connection; import java.sql.SQLException; import javax.transaction.TransactionManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.SessionException; import org.hibernate.Transaction; import org.hibernate.TransactionException; -import org.hibernate.util.JTAHelper; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.transaction.CacheSynchronization; import org.hibernate.transaction.TransactionFactory; +import org.hibernate.util.JTAHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Acts as the mediary between "entity-mode related" sessions in terms of Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/BasicLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/BasicLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/BasicLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.loader; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.Loadable; -import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.type.BagType; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/Loader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/Loader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/Loader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -38,8 +38,6 @@ import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.LockMode; @@ -83,6 +81,8 @@ import org.hibernate.type.Type; import org.hibernate.type.VersionType; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract superclass of object loading (and querying) strategies. This class implements Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,12 +26,12 @@ import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.MappingException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.loader.JoinWalker; import org.hibernate.persister.collection.QueryableCollection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Loads a collection of values or a many-to-many association. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,12 +26,12 @@ import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.MappingException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.loader.JoinWalker; import org.hibernate.persister.collection.QueryableCollection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Loads one-to-many associations<br> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -42,8 +42,8 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.impl.CriteriaImpl; import org.hibernate.loader.OuterJoinLoader; +import org.hibernate.persister.entity.Lockable; import org.hibernate.persister.entity.OuterJoinLoadable; -import org.hibernate.persister.entity.Lockable; import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,11 +29,11 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; import java.util.StringTokenizer; -import java.util.LinkedHashMap; import org.hibernate.Criteria; import org.hibernate.EntityMode; @@ -41,20 +41,20 @@ import org.hibernate.LockMode; import org.hibernate.MappingException; import org.hibernate.QueryException; -import org.hibernate.hql.ast.util.SessionFactoryHelper; import org.hibernate.criterion.CriteriaQuery; import org.hibernate.criterion.Projection; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.RowSelection; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.TypedValue; +import org.hibernate.hql.ast.util.SessionFactoryHelper; import org.hibernate.impl.CriteriaImpl; import org.hibernate.persister.entity.Loadable; import org.hibernate.persister.entity.PropertyMapping; import org.hibernate.persister.entity.Queryable; import org.hibernate.type.AssociationType; +import org.hibernate.type.NullableType; import org.hibernate.type.Type; -import org.hibernate.type.NullableType; import org.hibernate.util.ArrayHelper; import org.hibernate.util.StringHelper; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.loader.custom; +import org.hibernate.LockMode; import org.hibernate.loader.CollectionAliases; import org.hibernate.loader.EntityAliases; -import org.hibernate.LockMode; /** * Spefically a fetch return that refers to a collection association. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CustomLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CustomLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CustomLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,12 +27,12 @@ import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.HashSet; import org.hibernate.HibernateException; import org.hibernate.LockMode; @@ -50,10 +50,10 @@ import org.hibernate.persister.entity.Loadable; import org.hibernate.persister.entity.Queryable; import org.hibernate.transform.ResultTransformer; +import org.hibernate.type.CollectionType; +import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; -import org.hibernate.type.EntityType; -import org.hibernate.type.CollectionType; import org.hibernate.util.ArrayHelper; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CustomQuery.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CustomQuery.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/CustomQuery.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.loader.custom; +import java.util.List; import java.util.Map; import java.util.Set; -import java.util.List; /** * Extension point allowing any SQL query with named and positional parameters Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/EntityFetchReturn.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/EntityFetchReturn.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/EntityFetchReturn.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.loader.custom; +import org.hibernate.LockMode; import org.hibernate.loader.EntityAliases; -import org.hibernate.LockMode; /** * Spefically a fetch return that refers to an entity association. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/NonScalarReturn.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/NonScalarReturn.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/NonScalarReturn.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.loader.custom; +import org.hibernate.HibernateException; import org.hibernate.LockMode; -import org.hibernate.HibernateException; /** * Represents some non-scalar (entity/collection) return within the query result. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,15 +26,15 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.HashMap; import org.hibernate.HibernateException; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.query.sql.NativeSQLQueryReturn; -import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.loader.custom.CustomQuery; import org.hibernate.persister.collection.SQLLoadableCollection; import org.hibernate.persister.entity.SQLLoadable; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,16 @@ */ package org.hibernate.loader.custom.sql; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.hibernate.QueryException; import org.hibernate.engine.query.ParameterParser; import org.hibernate.persister.collection.SQLLoadableCollection; import org.hibernate.persister.entity.SQLLoadable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @author Gavin King * @author Max Andersen Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,28 +32,28 @@ import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.loader.custom.Return; -import org.hibernate.loader.custom.ScalarReturn; -import org.hibernate.loader.custom.RootReturn; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.query.sql.NativeSQLQueryCollectionReturn; +import org.hibernate.engine.query.sql.NativeSQLQueryJoinReturn; +import org.hibernate.engine.query.sql.NativeSQLQueryNonScalarReturn; +import org.hibernate.engine.query.sql.NativeSQLQueryReturn; +import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn; +import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; +import org.hibernate.loader.BasicLoader; +import org.hibernate.loader.CollectionAliases; +import org.hibernate.loader.ColumnEntityAliases; +import org.hibernate.loader.DefaultEntityAliases; +import org.hibernate.loader.EntityAliases; +import org.hibernate.loader.GeneratedCollectionAliases; +import org.hibernate.loader.custom.CollectionFetchReturn; import org.hibernate.loader.custom.CollectionReturn; import org.hibernate.loader.custom.ColumnCollectionAliases; +import org.hibernate.loader.custom.EntityFetchReturn; import org.hibernate.loader.custom.FetchReturn; -import org.hibernate.loader.custom.CollectionFetchReturn; import org.hibernate.loader.custom.NonScalarReturn; -import org.hibernate.loader.custom.EntityFetchReturn; -import org.hibernate.loader.BasicLoader; -import org.hibernate.loader.EntityAliases; -import org.hibernate.loader.DefaultEntityAliases; -import org.hibernate.loader.ColumnEntityAliases; -import org.hibernate.loader.CollectionAliases; -import org.hibernate.loader.GeneratedCollectionAliases; -import org.hibernate.engine.query.sql.NativeSQLQueryReturn; -import org.hibernate.engine.query.sql.NativeSQLQueryCollectionReturn; -import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; -import org.hibernate.engine.query.sql.NativeSQLQueryNonScalarReturn; -import org.hibernate.engine.query.sql.NativeSQLQueryJoinReturn; -import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn; -import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.loader.custom.Return; +import org.hibernate.loader.custom.RootReturn; +import org.hibernate.loader.custom.ScalarReturn; import org.hibernate.persister.collection.SQLLoadableCollection; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.SQLLoadable; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,8 +30,6 @@ import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; @@ -39,6 +37,8 @@ import org.hibernate.persister.entity.OuterJoinLoadable; import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractEntityLoader extends OuterJoinLoader implements UniqueEntityLoader { Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,6 @@ import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.MappingException; @@ -43,6 +41,8 @@ import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/hql/QueryLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/hql/QueryLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/loader/hql/QueryLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -45,16 +45,16 @@ import org.hibernate.hql.HolderInstantiator; import org.hibernate.hql.ast.QueryTranslatorImpl; import org.hibernate.hql.ast.tree.FromElement; +import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.hql.ast.tree.SelectClause; -import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.impl.IteratorImpl; import org.hibernate.loader.BasicLoader; import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.Loadable; +import org.hibernate.persister.entity.Lockable; import org.hibernate.persister.entity.Queryable; -import org.hibernate.persister.entity.Lockable; import org.hibernate.transform.ResultTransformer; import org.hibernate.type.EntityType; import org.hibernate.type.Type; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Any.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Any.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Any.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,8 +28,8 @@ import java.util.Map; import org.hibernate.MappingException; +import org.hibernate.type.AnyType; import org.hibernate.type.MetaType; -import org.hibernate.type.AnyType; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Collection.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Collection.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Collection.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,8 +32,8 @@ import org.hibernate.FetchMode; import org.hibernate.MappingException; +import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.Mapping; -import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.type.CollectionType; import org.hibernate.type.Type; import org.hibernate.type.TypeFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Join.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Join.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Join.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,8 +28,8 @@ import java.util.ArrayList; import java.util.Iterator; +import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.sql.Alias; -import org.hibernate.engine.ExecuteUpdateResultCheckStyle; /** * @author Gavin King Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/PersistentClass.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/PersistentClass.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/PersistentClass.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,14 +25,18 @@ package org.hibernate.mapping; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.Set; +import java.util.StringTokenizer; +import org.hibernate.EntityMode; import org.hibernate.MappingException; -import org.hibernate.EntityMode; import org.hibernate.dialect.Dialect; +import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.Mapping; -import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.sql.Alias; import org.hibernate.util.EmptyIterator; import org.hibernate.util.JoinedIterator; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Property.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Property.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Property.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,9 +28,9 @@ import java.util.Iterator; import java.util.StringTokenizer; +import org.hibernate.EntityMode; import org.hibernate.MappingException; import org.hibernate.PropertyNotFoundException; -import org.hibernate.EntityMode; import org.hibernate.engine.CascadeStyle; import org.hibernate.engine.Mapping; import org.hibernate.property.Getter; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/RelationalModel.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/RelationalModel.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/RelationalModel.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.mapping; -import org.hibernate.engine.Mapping; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; +import org.hibernate.engine.Mapping; /** * A relational object which may be created using DDL Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/RootClass.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/RootClass.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/RootClass.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,11 +29,11 @@ import java.util.Iterator; import java.util.Set; -import org.slf4j.LoggerFactory; import org.hibernate.MappingException; import org.hibernate.engine.Mapping; import org.hibernate.util.ReflectHelper; import org.hibernate.util.SingletonIterator; +import org.slf4j.LoggerFactory; /** * The root class of an inheritance hierarchy Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/SimpleAuxiliaryDatabaseObject.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/SimpleAuxiliaryDatabaseObject.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/SimpleAuxiliaryDatabaseObject.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,9 +26,9 @@ import java.util.HashSet; +import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.Mapping; -import org.hibernate.HibernateException; import org.hibernate.util.StringHelper; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Subclass.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Subclass.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Subclass.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,7 +24,9 @@ */ package org.hibernate.mapping; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.Map; import org.hibernate.AssertionFailure; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Table.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Table.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/mapping/Table.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,9 +28,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.LinkedHashMap; import org.hibernate.HibernateException; import org.hibernate.MappingException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/metadata/ClassMetadata.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/metadata/ClassMetadata.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/metadata/ClassMetadata.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,8 +27,8 @@ import java.io.Serializable; import java.util.Map; +import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.EntityMode; import org.hibernate.engine.SessionImplementor; import org.hibernate.type.Type; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/NamedParameterSpecification.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/NamedParameterSpecification.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/NamedParameterSpecification.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,13 +24,13 @@ */ package org.hibernate.param; +import java.sql.PreparedStatement; +import java.sql.SQLException; + import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.TypedValue; -import java.sql.PreparedStatement; -import java.sql.SQLException; - /** * Parameter bind specification for an explicit named parameter. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/ParameterSpecification.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/ParameterSpecification.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/ParameterSpecification.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,13 +24,13 @@ */ package org.hibernate.param; +import java.sql.PreparedStatement; +import java.sql.SQLException; + import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionImplementor; import org.hibernate.type.Type; -import java.sql.PreparedStatement; -import java.sql.SQLException; - /** * Maintains information relating to parameters which need to get bound into a * JDBC {@link PreparedStatement}. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/PositionalParameterSpecification.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/PositionalParameterSpecification.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/PositionalParameterSpecification.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,13 +24,13 @@ */ package org.hibernate.param; +import java.sql.PreparedStatement; +import java.sql.SQLException; + import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionImplementor; import org.hibernate.type.Type; -import java.sql.PreparedStatement; -import java.sql.SQLException; - /** * Parameter bind specification for an explicit positional (or ordinal) parameter. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/VersionTypeSeedParameterSpecification.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/VersionTypeSeedParameterSpecification.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/param/VersionTypeSeedParameterSpecification.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.param; +import java.sql.PreparedStatement; +import java.sql.SQLException; + import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionImplementor; +import org.hibernate.type.Type; import org.hibernate.type.VersionType; -import org.hibernate.type.Type; -import java.sql.PreparedStatement; -import java.sql.SQLException; - /** * Parameter bind specification used for optimisitc lock version seeding (from insert statements). * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/PersisterFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/PersisterFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/PersisterFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,8 @@ import org.hibernate.HibernateException; import org.hibernate.MappingException; +import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cache.access.EntityRegionAccessStrategy; -import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cfg.Configuration; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; 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 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -33,16 +33,12 @@ import java.util.Iterator; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.AssertionFailure; import org.hibernate.FetchMode; import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.TransientObjectException; -import org.hibernate.jdbc.Expectation; -import org.hibernate.jdbc.Expectations; import org.hibernate.cache.CacheException; import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cache.entry.CacheEntryStructure; @@ -53,14 +49,16 @@ import org.hibernate.collection.PersistentCollection; import org.hibernate.dialect.Dialect; import org.hibernate.engine.EntityKey; +import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.PersistenceContext; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.SubselectFetch; -import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.id.IdentifierGenerator; +import org.hibernate.jdbc.Expectation; +import org.hibernate.jdbc.Expectations; import org.hibernate.loader.collection.CollectionInitializer; import org.hibernate.mapping.Collection; import org.hibernate.mapping.Column; @@ -87,6 +85,8 @@ import org.hibernate.util.CollectionHelper; import org.hibernate.util.FilterHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,10 +31,6 @@ import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.jdbc.Expectations; -import org.hibernate.jdbc.Expectation; -import org.hibernate.type.AssociationType; -import org.hibernate.persister.entity.Joinable; import org.hibernate.cache.CacheException; import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cfg.Configuration; @@ -43,15 +39,19 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.SubselectFetch; import org.hibernate.exception.JDBCExceptionHelper; +import org.hibernate.jdbc.Expectation; +import org.hibernate.jdbc.Expectations; import org.hibernate.loader.collection.BatchingCollectionInitializer; import org.hibernate.loader.collection.CollectionInitializer; import org.hibernate.loader.collection.SubselectCollectionLoader; import org.hibernate.mapping.Collection; +import org.hibernate.persister.entity.Joinable; import org.hibernate.pretty.MessageHelper; import org.hibernate.sql.Delete; import org.hibernate.sql.Insert; +import org.hibernate.sql.SelectFragment; import org.hibernate.sql.Update; -import org.hibernate.sql.SelectFragment; +import org.hibernate.type.AssociationType; import org.hibernate.util.ArrayHelper; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,13 +26,13 @@ import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.impl.AbstractQueryImpl; import org.hibernate.loader.collection.CollectionInitializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A wrapper around a named query. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,8 +31,6 @@ import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.jdbc.Expectation; -import org.hibernate.jdbc.Expectations; import org.hibernate.cache.CacheException; import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cfg.Configuration; @@ -41,6 +39,8 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.SubselectFetch; import org.hibernate.exception.JDBCExceptionHelper; +import org.hibernate.jdbc.Expectation; +import org.hibernate.jdbc.Expectations; import org.hibernate.loader.collection.BatchingCollectionInitializer; import org.hibernate.loader.collection.CollectionInitializer; import org.hibernate.loader.collection.SubselectOneToManyLoader; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,15 +30,13 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.Comparator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.FetchMode; @@ -48,36 +46,35 @@ import org.hibernate.QueryException; import org.hibernate.StaleObjectStateException; import org.hibernate.StaleStateException; -import org.hibernate.jdbc.Expectation; -import org.hibernate.jdbc.Expectations; -import org.hibernate.jdbc.TooManyRowsAffectedException; -import org.hibernate.dialect.lock.LockingStrategy; -import org.hibernate.cache.CacheConcurrencyStrategy; import org.hibernate.cache.CacheKey; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.entry.CacheEntry; import org.hibernate.cache.entry.CacheEntryStructure; import org.hibernate.cache.entry.StructuredCacheEntry; import org.hibernate.cache.entry.UnstructuredCacheEntry; +import org.hibernate.dialect.lock.LockingStrategy; import org.hibernate.engine.CascadeStyle; import org.hibernate.engine.CascadingAction; import org.hibernate.engine.EntityEntry; +import org.hibernate.engine.EntityKey; +import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.Versioning; -import org.hibernate.engine.ExecuteUpdateResultCheckStyle; -import org.hibernate.engine.EntityKey; import org.hibernate.engine.ValueInclusion; +import org.hibernate.engine.Versioning; import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.PostInsertIdentifierGenerator; import org.hibernate.id.PostInsertIdentityPersister; -import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; import org.hibernate.id.insert.Binder; -import org.hibernate.intercept.LazyPropertyInitializer; +import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; import org.hibernate.intercept.FieldInterceptionHelper; import org.hibernate.intercept.FieldInterceptor; +import org.hibernate.intercept.LazyPropertyInitializer; +import org.hibernate.jdbc.Expectation; +import org.hibernate.jdbc.Expectations; +import org.hibernate.jdbc.TooManyRowsAffectedException; import org.hibernate.loader.entity.BatchingEntityLoader; import org.hibernate.loader.entity.CascadeEntityLoader; import org.hibernate.loader.entity.EntityLoader; @@ -99,9 +96,9 @@ import org.hibernate.sql.SimpleSelect; import org.hibernate.sql.Template; import org.hibernate.sql.Update; +import org.hibernate.tuple.Tuplizer; import org.hibernate.tuple.entity.EntityMetamodel; import org.hibernate.tuple.entity.EntityTuplizer; -import org.hibernate.tuple.Tuplizer; import org.hibernate.type.AbstractComponentType; import org.hibernate.type.AssociationType; import org.hibernate.type.EntityType; @@ -112,6 +109,8 @@ import org.hibernate.util.CollectionHelper; import org.hibernate.util.FilterHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Basic functionality for persisting an entity via JDBC Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/EntityPersister.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/EntityPersister.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/EntityPersister.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,11 +27,10 @@ import java.io.Serializable; import java.util.Map; +import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.MappingException; -import org.hibernate.EntityMode; -import org.hibernate.tuple.entity.EntityMetamodel; import org.hibernate.cache.OptimisticCacheSource; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.entry.CacheEntryStructure; @@ -41,6 +40,7 @@ import org.hibernate.engine.ValueInclusion; import org.hibernate.id.IdentifierGenerator; import org.hibernate.metadata.ClassMetadata; +import org.hibernate.tuple.entity.EntityMetamodel; import org.hibernate.type.Type; import org.hibernate.type.VersionType; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/Joinable.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/Joinable.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/Joinable.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.persister.entity; +import java.util.Map; + import org.hibernate.MappingException; -import java.util.Map; - /** * Anything that can be loaded by outer join - namely * persisters for classes or collections. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -36,10 +36,10 @@ import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.cache.access.EntityRegionAccessStrategy; +import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.Versioning; -import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.mapping.Column; import org.hibernate.mapping.KeyValue; import org.hibernate.mapping.PersistentClass; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,14 +26,14 @@ import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.engine.EntityKey; import org.hibernate.engine.SessionImplementor; import org.hibernate.impl.AbstractQueryImpl; import org.hibernate.loader.entity.UniqueEntityLoader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Not really a <tt>Loader</tt>, just a wrapper around a Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -35,9 +35,9 @@ import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.cache.access.EntityRegionAccessStrategy; +import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.mapping.Column; import org.hibernate.mapping.Formula; import org.hibernate.mapping.Join; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,12 +25,12 @@ package org.hibernate.persister.entity; import java.io.Serializable; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map; -import java.util.ArrayList; import org.hibernate.AssertionFailure; import org.hibernate.Hibernate; @@ -40,9 +40,9 @@ import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cfg.Settings; import org.hibernate.dialect.Dialect; +import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.id.IdentityGenerator; import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/pretty/Printer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/pretty/Printer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/pretty/Printer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,15 +30,15 @@ import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.EntityMode; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.TypedValue; import org.hibernate.intercept.LazyPropertyInitializer; import org.hibernate.metadata.ClassMetadata; import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Renders entities to a nicely readable string. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/BasicPropertyAccessor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/BasicPropertyAccessor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/BasicPropertyAccessor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,15 +29,14 @@ import java.lang.reflect.Method; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.PropertyAccessException; import org.hibernate.PropertyNotFoundException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Accesses property values via a get/set pair, which may be nonpublic. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/EmbeddedPropertyAccessor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/EmbeddedPropertyAccessor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/EmbeddedPropertyAccessor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,8 @@ import org.hibernate.HibernateException; import org.hibernate.PropertyNotFoundException; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.SessionFactoryImplementor; /** * @author Gavin King Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/IndexPropertyAccessor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/IndexPropertyAccessor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/IndexPropertyAccessor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,8 +28,8 @@ import java.util.Map; import org.hibernate.HibernateException; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.SessionFactoryImplementor; /** * Represents a "back-reference" to the index of a collection. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/PropertyAccessorFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/PropertyAccessorFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/property/PropertyAccessorFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,11 +26,11 @@ import java.util.Map; +import org.hibernate.EntityMode; import org.hibernate.MappingException; -import org.hibernate.EntityMode; -import org.hibernate.type.Type; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.mapping.Property; +import org.hibernate.type.Type; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jLazyInitializer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jLazyInitializer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jLazyInitializer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.proxy.dom4j; +import java.io.Serializable; + +import org.dom4j.Element; import org.hibernate.engine.SessionImplementor; import org.hibernate.proxy.AbstractLazyInitializer; -import org.dom4j.Element; -import java.io.Serializable; - /** * Lazy initializer for "dom4j" entity representations. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jProxy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jProxy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jProxy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,31 +24,31 @@ */ package org.hibernate.proxy.dom4j; -import org.dom4j.Element; -import org.dom4j.QName; -import org.dom4j.Namespace; +import java.io.IOException; +import java.io.Serializable; +import java.io.Writer; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + import org.dom4j.Attribute; +import org.dom4j.Branch; import org.dom4j.CDATA; +import org.dom4j.Comment; +import org.dom4j.Document; +import org.dom4j.Element; import org.dom4j.Entity; -import org.dom4j.Text; +import org.dom4j.InvalidXPathException; +import org.dom4j.Namespace; import org.dom4j.Node; -import org.dom4j.Branch; import org.dom4j.ProcessingInstruction; -import org.dom4j.Comment; -import org.dom4j.Document; +import org.dom4j.QName; +import org.dom4j.Text; +import org.dom4j.Visitor; import org.dom4j.XPath; -import org.dom4j.InvalidXPathException; -import org.dom4j.Visitor; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; -import java.io.Serializable; -import java.io.Writer; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Iterator; - /** * Proxy for "dom4j" entity representations. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jProxyFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jProxyFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/dom4j/Dom4jProxyFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,16 @@ */ package org.hibernate.proxy.dom4j; +import java.io.Serializable; +import java.lang.reflect.Method; +import java.util.Set; + import org.hibernate.HibernateException; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.ProxyFactory; -import org.hibernate.proxy.HibernateProxy; import org.hibernate.type.AbstractComponentType; -import org.hibernate.engine.SessionImplementor; -import java.util.Set; -import java.lang.reflect.Method; -import java.io.Serializable; - /** * Builds proxies for "dom4j" entity representations. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/map/MapProxy.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/map/MapProxy.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/map/MapProxy.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.proxy.map; -import org.hibernate.proxy.HibernateProxy; -import org.hibernate.proxy.LazyInitializer; - import java.io.Serializable; import java.util.Collection; import java.util.Map; import java.util.Set; +import org.hibernate.proxy.HibernateProxy; +import org.hibernate.proxy.LazyInitializer; + /** * Proxy for "dynamic-map" entity representations. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/map/MapProxyFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/map/MapProxyFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/map/MapProxyFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,9 +29,9 @@ import java.util.Set; import org.hibernate.HibernateException; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.ProxyFactory; -import org.hibernate.proxy.HibernateProxy; -import org.hibernate.engine.SessionImplementor; import org.hibernate.type.AbstractComponentType; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,10 +29,10 @@ import org.hibernate.engine.EntityKey; import org.hibernate.engine.SessionImplementor; +import org.hibernate.proxy.AbstractLazyInitializer; import org.hibernate.type.AbstractComponentType; import org.hibernate.util.MarkerObject; import org.hibernate.util.ReflectHelper; -import org.hibernate.proxy.AbstractLazyInitializer; /** * Lazy initializer for POJOs Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -36,12 +36,11 @@ import org.hibernate.HibernateException; import org.hibernate.LazyInitializationException; -import org.hibernate.proxy.pojo.BasicLazyInitializer; -import org.hibernate.proxy.HibernateProxy; import org.hibernate.engine.SessionImplementor; +import org.hibernate.proxy.HibernateProxy; +import org.hibernate.proxy.pojo.BasicLazyInitializer; import org.hibernate.type.AbstractComponentType; import org.hibernate.util.ReflectHelper; - import org.slf4j.LoggerFactory; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBProxyFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBProxyFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBProxyFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,9 +29,9 @@ import java.util.Set; import org.hibernate.HibernateException; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.ProxyFactory; -import org.hibernate.proxy.HibernateProxy; -import org.hibernate.engine.SessionImplementor; import org.hibernate.type.AbstractComponentType; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -33,13 +33,13 @@ import javassist.util.proxy.ProxyFactory; import javassist.util.proxy.ProxyObject; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; +import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.pojo.BasicLazyInitializer; -import org.hibernate.proxy.HibernateProxy; import org.hibernate.type.AbstractComponentType; import org.hibernate.util.ReflectHelper; +import org.slf4j.LoggerFactory; /** * A Javassist-based lazy initializer proxy. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCConfiguration.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCConfiguration.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCConfiguration.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,9 +31,9 @@ import javax.security.jacc.PolicyConfigurationFactory; import javax.security.jacc.PolicyContextException; +import org.hibernate.HibernateException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.HibernateException; /** * Adds Hibernate permissions to roles via JACC Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCPermissions.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCPermissions.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/secure/JACCPermissions.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -34,6 +34,7 @@ import java.security.PrivilegedExceptionAction; import java.security.ProtectionDomain; import java.util.Set; + import javax.security.auth.Subject; import javax.security.jacc.EJBMethodPermission; import javax.security.jacc.PolicyContext; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/CaseFragment.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/CaseFragment.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/CaseFragment.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.sql; +import java.util.LinkedHashMap; import java.util.Map; -import java.util.LinkedHashMap; import org.hibernate.util.StringHelper; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/Insert.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/Insert.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/Insert.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,8 +25,8 @@ package org.hibernate.sql; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; -import java.util.LinkedHashMap; import org.hibernate.dialect.Dialect; import org.hibernate.type.LiteralType; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/InsertSelect.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/InsertSelect.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/InsertSelect.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,13 +24,13 @@ */ package org.hibernate.sql; -import org.hibernate.dialect.Dialect; -import org.hibernate.HibernateException; - -import java.util.List; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; +import org.hibernate.HibernateException; +import org.hibernate.dialect.Dialect; + /** * Implementation of InsertSelect. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/Update.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/Update.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/sql/Update.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,8 +25,8 @@ package org.hibernate.sql; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; -import java.util.LinkedHashMap; import org.hibernate.dialect.Dialect; import org.hibernate.type.LiteralType; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/stat/StatisticsImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/stat/StatisticsImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/stat/StatisticsImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,11 +26,11 @@ import java.util.HashMap; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.cache.Region; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.util.ArrayHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @see org.hibernate.stat.Statistics Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -34,14 +34,14 @@ import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; +import org.hibernate.dialect.Dialect; import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.mapping.Table; -import org.hibernate.dialect.Dialect; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JDBC database metadata Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.tool.hbm2ddl; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; + import org.hibernate.connection.ConnectionProvider; import org.hibernate.connection.ConnectionProviderFactory; import org.hibernate.util.JDBCExceptionReporter; -import java.util.Properties; -import java.sql.Connection; -import java.sql.SQLException; - /** * A {@link ConnectionHelper} implementation based on an internally * built and managed {@link ConnectionProvider}. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -41,9 +41,6 @@ import java.util.List; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.JDBCException; import org.hibernate.cfg.Configuration; @@ -58,6 +55,8 @@ import org.hibernate.util.JDBCExceptionReporter; import org.hibernate.util.PropertiesHelper; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Commandline tool to export table schema to the database. This class may also be called from inside an application. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExportTask.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExportTask.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExportTask.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,18 +24,6 @@ */ package org.hibernate.tool.hbm2ddl; -import org.hibernate.HibernateException; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.NamingStrategy; -import org.hibernate.util.ArrayHelper; -import org.hibernate.util.ReflectHelper; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.FileSet; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -45,6 +33,17 @@ import java.util.List; import java.util.Properties; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.FileSet; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.NamingStrategy; +import org.hibernate.util.ArrayHelper; +import org.hibernate.util.ReflectHelper; + /** * An Ant task for <tt>SchemaExport</tt>. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,18 +24,6 @@ */ package org.hibernate.tool.hbm2ddl; -import org.hibernate.HibernateException; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.NamingStrategy; -import org.hibernate.util.ArrayHelper; -import org.hibernate.util.ReflectHelper; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.FileSet; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -45,6 +33,17 @@ import java.util.List; import java.util.Properties; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.FileSet; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.NamingStrategy; +import org.hibernate.util.ArrayHelper; +import org.hibernate.util.ReflectHelper; + /** * An Ant task for <tt>SchemaUpdate</tt>. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,14 +29,14 @@ import java.sql.SQLException; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.NamingStrategy; import org.hibernate.cfg.Settings; import org.hibernate.dialect.Dialect; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A commandline tool to update a database schema. May also be called from Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,18 +24,6 @@ */ package org.hibernate.tool.hbm2ddl; -import org.hibernate.HibernateException; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.NamingStrategy; -import org.hibernate.util.ArrayHelper; -import org.hibernate.util.ReflectHelper; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.FileSet; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -45,6 +33,17 @@ import java.util.List; import java.util.Properties; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.FileSet; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.NamingStrategy; +import org.hibernate.util.ArrayHelper; +import org.hibernate.util.ReflectHelper; + /** * An Ant task for <tt>SchemaUpdate</tt>. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.tool.hbm2ddl; -import org.hibernate.util.JDBCExceptionReporter; - import java.sql.Connection; import java.sql.SQLException; +import org.hibernate.util.JDBCExceptionReporter; + /** * A {@link ConnectionHelper} implementation based on an explicitly supplied * connection. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.tool.hbm2ddl; +import java.sql.Connection; +import java.sql.SQLException; + import org.hibernate.connection.ConnectionProvider; import org.hibernate.util.JDBCExceptionReporter; -import java.sql.Connection; -import java.sql.SQLException; - /** * A {@link ConnectionHelper} implementation based on a provided * {@link ConnectionProvider}. Essentially, ensures that the connection Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,14 +28,13 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashMap; -import java.util.Map; import java.util.Iterator; +import java.util.Map; +import org.hibernate.mapping.ForeignKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.mapping.ForeignKey; - /** * JDBC table metadata * @author Christoph Sturm, Max Rydahl Andersen Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/instrument/BasicInstrumentationTask.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/instrument/BasicInstrumentationTask.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tool/instrument/BasicInstrumentationTask.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,22 +23,21 @@ */ package org.hibernate.tool.instrument; -import org.apache.tools.ant.Task; +import java.io.File; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; - import org.hibernate.bytecode.buildtime.Instrumenter; import org.hibernate.bytecode.buildtime.Logger; -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Set; -import java.util.HashSet; -import java.io.File; - /** * Super class for all Hibernate instrumentation tasks. Provides the basic templating of how instrumentation * should occur; subclasses simply plug in to that process appropriately for the given bytecode provider. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/BTMTransactionManagerLookup.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/BTMTransactionManagerLookup.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/BTMTransactionManagerLookup.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,8 @@ import java.util.Properties; +import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import javax.transaction.Transaction; import org.hibernate.HibernateException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CMTTransaction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CMTTransaction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CMTTransaction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,13 +28,13 @@ import javax.transaction.Synchronization; import javax.transaction.SystemException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.HibernateException; import org.hibernate.Transaction; import org.hibernate.TransactionException; import org.hibernate.jdbc.JDBCContext; import org.hibernate.util.JTAHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Implements a basic transaction strategy for CMT transactions. All work is Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CMTTransactionFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CMTTransactionFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CMTTransactionFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,15 +26,15 @@ import java.util.Properties; +import javax.transaction.SystemException; + import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; import org.hibernate.Transaction; import org.hibernate.TransactionException; +import org.hibernate.jdbc.JDBCContext; import org.hibernate.util.JTAHelper; -import org.hibernate.jdbc.JDBCContext; -import javax.transaction.SystemException; - /** * Factory for {@link CMTTransaction} instances. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CacheSynchronization.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CacheSynchronization.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/CacheSynchronization.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,12 +29,11 @@ import javax.transaction.SystemException; import javax.transaction.Transaction; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.TransactionException; import org.hibernate.jdbc.JDBCContext; import org.hibernate.util.JTAHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A JTA transaction synch used to allow the {@link org.hibernate.Session} to know about transaction Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JDBCTransaction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JDBCTransaction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JDBCTransaction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,16 +27,16 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; + import javax.transaction.Status; import javax.transaction.Synchronization; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.Transaction; import org.hibernate.TransactionException; import org.hibernate.jdbc.JDBCContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link Transaction} implementation based on transaction management through Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JNDITransactionManagerLookup.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JNDITransactionManagerLookup.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JNDITransactionManagerLookup.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,8 +27,8 @@ import java.util.Properties; import javax.naming.NamingException; +import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import javax.transaction.Transaction; import org.hibernate.HibernateException; import org.hibernate.util.NamingHelper; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JOTMTransactionManagerLookup.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JOTMTransactionManagerLookup.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JOTMTransactionManagerLookup.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,8 @@ import java.util.Properties; +import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import javax.transaction.Transaction; import org.hibernate.HibernateException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JOnASTransactionManagerLookup.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JOnASTransactionManagerLookup.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JOnASTransactionManagerLookup.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,8 +26,8 @@ import java.util.Properties; +import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import javax.transaction.Transaction; import org.hibernate.HibernateException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JTATransaction.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JTATransaction.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JTATransaction.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,14 +30,13 @@ import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.Transaction; import org.hibernate.TransactionException; import org.hibernate.jdbc.JDBCContext; import org.hibernate.util.JTAHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link Transaction} implementation based on transaction management through Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JTATransactionFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JTATransactionFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/JTATransactionFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,17 +31,16 @@ import javax.transaction.SystemException; import javax.transaction.UserTransaction; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; import org.hibernate.Transaction; import org.hibernate.TransactionException; -import org.hibernate.jdbc.JDBCContext; import org.hibernate.cfg.Environment; -import org.hibernate.util.NamingHelper; +import org.hibernate.jdbc.JDBCContext; import org.hibernate.util.JTAHelper; +import org.hibernate.util.NamingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Factory for {@link JTATransaction} instances. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionFactoryFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionFactoryFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionFactoryFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,12 +26,11 @@ import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Helper for creating {@link TransactionFactory} instances. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionManagerLookup.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionManagerLookup.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionManagerLookup.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,6 +25,7 @@ package org.hibernate.transaction; import java.util.Properties; + import javax.transaction.Transaction; import javax.transaction.TransactionManager; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionManagerLookupFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionManagerLookupFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/TransactionManagerLookupFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,12 +28,11 @@ import javax.transaction.TransactionManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Helper for generating {@link TransactionManagerLookup} instances. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/WebSphereTransactionManagerLookup.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/WebSphereTransactionManagerLookup.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transaction/WebSphereTransactionManagerLookup.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,14 +26,13 @@ import java.util.Properties; -import javax.transaction.TransactionManager; import javax.transaction.Transaction; +import javax.transaction.TransactionManager; +import org.hibernate.HibernateException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.HibernateException; - /** * {@link TransactionManagerLookup} strategy for WebSphere (versions 4, 5.0 and 5.1) * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/AliasToEntityMapResultTransformer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/AliasToEntityMapResultTransformer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/AliasToEntityMapResultTransformer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.transform; +import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import java.io.Serializable; /** * {@link ResultTransformer} implementation which builds a map for each "row", made up of each aliased value Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/DistinctResultTransformer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/DistinctResultTransformer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/DistinctResultTransformer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.transform; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; -import java.util.ArrayList; import java.util.Set; -import java.util.HashSet; -import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/DistinctRootEntityResultTransformer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/DistinctRootEntityResultTransformer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/DistinctRootEntityResultTransformer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,8 +24,8 @@ */ package org.hibernate.transform; +import java.io.Serializable; import java.util.List; -import java.io.Serializable; /** * Much like {@link RootEntityResultTransformer}, but we also distinct the entity in the final result. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/ToListResultTransformer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/ToListResultTransformer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/transform/ToListResultTransformer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.transform; +import java.io.Serializable; import java.util.Arrays; import java.util.List; -import java.io.Serializable; /** * Tranforms each result row from a tuple into a {@link List}, such that what Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/Dom4jInstantiator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/Dom4jInstantiator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/Dom4jInstantiator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,9 +29,9 @@ import java.util.Iterator; import org.dom4j.Element; +import org.hibernate.mapping.Component; +import org.hibernate.mapping.PersistentClass; import org.hibernate.util.XMLHelper; -import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.Component; /** * Performs "instantiation" based on DOM4J elements. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/EntityModeToTuplizerMapping.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/EntityModeToTuplizerMapping.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/EntityModeToTuplizerMapping.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,10 +27,10 @@ import java.io.Serializable; import java.util.Iterator; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import java.util.concurrent.ConcurrentHashMap; /** * Centralizes handling of {@link EntityMode} to {@link Tuplizer} mappings. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/PojoInstantiator.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/PojoInstantiator.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/PojoInstantiator.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,14 +28,14 @@ import java.io.Serializable; import java.lang.reflect.Constructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.InstantiationException; import org.hibernate.PropertyNotFoundException; import org.hibernate.bytecode.ReflectionOptimizer; +import org.hibernate.mapping.Component; import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.Component; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Defines a POJO-based instantiator for use from the tuplizers. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/Property.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/Property.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/Property.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.tuple; +import java.io.Serializable; + import org.hibernate.type.Type; -import java.io.Serializable; - /** * Defines the basic contract of a Property within the runtime metamodel. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/PropertyFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/PropertyFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/PropertyFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,7 +27,6 @@ import java.lang.reflect.Constructor; import org.hibernate.EntityMode; -import org.hibernate.mapping.PropertyGeneration; import org.hibernate.engine.IdentifierValue; import org.hibernate.engine.UnsavedValueFactory; import org.hibernate.engine.VersionValue; @@ -35,6 +34,7 @@ import org.hibernate.mapping.KeyValue; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; +import org.hibernate.mapping.PropertyGeneration; import org.hibernate.property.Getter; import org.hibernate.property.PropertyAccessor; import org.hibernate.property.PropertyAccessorFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/StandardProperty.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/StandardProperty.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/StandardProperty.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.tuple; +import org.hibernate.FetchMode; import org.hibernate.engine.CascadeStyle; import org.hibernate.type.Type; -import org.hibernate.FetchMode; /** * Represents a basic property within the Hibernate runtime-metamodel. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/AbstractComponentTuplizer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/AbstractComponentTuplizer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/AbstractComponentTuplizer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,12 +28,12 @@ import java.util.Iterator; import org.hibernate.HibernateException; -import org.hibernate.tuple.Instantiator; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.mapping.Component; import org.hibernate.mapping.Property; import org.hibernate.property.Getter; import org.hibernate.property.Setter; +import org.hibernate.tuple.Instantiator; /** * Support for tuplizers relating to components. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentEntityModeToTuplizerMapping.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentEntityModeToTuplizerMapping.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentEntityModeToTuplizerMapping.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,17 +24,17 @@ */ package org.hibernate.tuple.component; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.hibernate.EntityMode; +import org.hibernate.mapping.Component; +import org.hibernate.mapping.PersistentClass; import org.hibernate.tuple.EntityModeToTuplizerMapping; import org.hibernate.tuple.Tuplizer; -import org.hibernate.mapping.Component; -import org.hibernate.mapping.PersistentClass; -import org.hibernate.EntityMode; -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; -import java.io.Serializable; - /** * Handles mapping {@link EntityMode}s to {@link ComponentTuplizer}s. * <p/> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentMetamodel.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentMetamodel.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentMetamodel.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,17 +24,17 @@ */ package org.hibernate.tuple.component; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.hibernate.HibernateException; import org.hibernate.mapping.Component; import org.hibernate.mapping.Property; -import org.hibernate.HibernateException; +import org.hibernate.tuple.PropertyFactory; import org.hibernate.tuple.StandardProperty; -import org.hibernate.tuple.PropertyFactory; -import java.io.Serializable; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; - /** * Centralizes metamodel information about a component. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentTuplizerFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentTuplizerFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/ComponentTuplizerFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,15 +24,15 @@ */ package org.hibernate.tuple.component; +import java.io.Serializable; +import java.lang.reflect.Constructor; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.lang.reflect.Constructor; -import java.io.Serializable; -import org.hibernate.util.ReflectHelper; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.mapping.Component; +import org.hibernate.util.ReflectHelper; /** * A registry allowing users to define the default {@link ComponentTuplizer} class to use per {@link EntityMode}. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/Dom4jComponentTuplizer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/Dom4jComponentTuplizer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/Dom4jComponentTuplizer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,8 +31,8 @@ import org.hibernate.property.PropertyAccessor; import org.hibernate.property.PropertyAccessorFactory; import org.hibernate.property.Setter; +import org.hibernate.tuple.Dom4jInstantiator; import org.hibernate.tuple.Instantiator; -import org.hibernate.tuple.Dom4jInstantiator; /** * A {@link ComponentTuplizer} specific to the dom4j entity mode. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/DynamicMapComponentTuplizer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/DynamicMapComponentTuplizer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/component/DynamicMapComponentTuplizer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,8 +32,8 @@ import org.hibernate.property.PropertyAccessor; import org.hibernate.property.PropertyAccessorFactory; import org.hibernate.property.Setter; +import org.hibernate.tuple.DynamicMapInstantiator; import org.hibernate.tuple.Instantiator; -import org.hibernate.tuple.DynamicMapInstantiator; /** * A {@link ComponentTuplizer} specific to the dynamic-map entity mode. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,12 +29,8 @@ import java.util.Map; import java.util.Set; -import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.tuple.Instantiator; -import org.hibernate.tuple.VersionProperty; -import org.hibernate.tuple.StandardProperty; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.id.Assigned; @@ -45,6 +41,9 @@ import org.hibernate.property.Getter; import org.hibernate.property.Setter; import org.hibernate.proxy.ProxyFactory; +import org.hibernate.tuple.Instantiator; +import org.hibernate.tuple.StandardProperty; +import org.hibernate.tuple.VersionProperty; import org.hibernate.type.AbstractComponentType; import org.hibernate.type.ComponentType; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/Dom4jEntityTuplizer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/Dom4jEntityTuplizer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/Dom4jEntityTuplizer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,32 +24,32 @@ */ package org.hibernate.tuple.entity; +import java.io.Serializable; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; + +import org.dom4j.Element; +import org.hibernate.EntityMode; +import org.hibernate.EntityNameResolver; +import org.hibernate.HibernateException; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; -import org.hibernate.proxy.ProxyFactory; -import org.hibernate.proxy.HibernateProxy; -import org.hibernate.proxy.dom4j.Dom4jProxyFactory; +import org.hibernate.property.Getter; import org.hibernate.property.PropertyAccessor; import org.hibernate.property.PropertyAccessorFactory; -import org.hibernate.property.Getter; import org.hibernate.property.Setter; -import org.hibernate.EntityMode; -import org.hibernate.HibernateException; -import org.hibernate.EntityNameResolver; -import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.proxy.HibernateProxy; +import org.hibernate.proxy.ProxyFactory; +import org.hibernate.proxy.dom4j.Dom4jProxyFactory; +import org.hibernate.tuple.Dom4jInstantiator; import org.hibernate.tuple.Instantiator; -import org.hibernate.tuple.Dom4jInstantiator; import org.hibernate.type.AbstractComponentType; -import org.dom4j.Element; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Serializable; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; - /** * An {@link EntityTuplizer} specific to the dom4j entity mode. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,19 +26,19 @@ import java.util.Map; import org.hibernate.EntityMode; +import org.hibernate.EntityNameResolver; import org.hibernate.HibernateException; -import org.hibernate.EntityNameResolver; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.tuple.Instantiator; -import org.hibernate.tuple.DynamicMapInstantiator; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.property.Getter; import org.hibernate.property.PropertyAccessor; import org.hibernate.property.PropertyAccessorFactory; import org.hibernate.property.Setter; +import org.hibernate.proxy.ProxyFactory; import org.hibernate.proxy.map.MapProxyFactory; -import org.hibernate.proxy.ProxyFactory; +import org.hibernate.tuple.DynamicMapInstantiator; +import org.hibernate.tuple.Instantiator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityEntityModeToTuplizerMapping.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityEntityModeToTuplizerMapping.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityEntityModeToTuplizerMapping.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,16 @@ */ package org.hibernate.tuple.entity; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.hibernate.EntityMode; +import org.hibernate.mapping.PersistentClass; import org.hibernate.tuple.EntityModeToTuplizerMapping; import org.hibernate.tuple.Tuplizer; -import org.hibernate.mapping.PersistentClass; -import org.hibernate.EntityMode; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; -import java.io.Serializable; - /** * Handles mapping {@link EntityMode}s to {@link EntityTuplizer}s. * <p/> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -33,24 +33,22 @@ import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.tuple.IdentifierProperty; -import org.hibernate.tuple.StandardProperty; -import org.hibernate.tuple.PropertyFactory; -import org.hibernate.tuple.VersionProperty; -import org.hibernate.intercept.FieldInterceptionHelper; import org.hibernate.engine.CascadeStyle; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.ValueInclusion; import org.hibernate.engine.Versioning; -import org.hibernate.engine.ValueInclusion; +import org.hibernate.intercept.FieldInterceptionHelper; import org.hibernate.mapping.Component; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.PropertyGeneration; +import org.hibernate.tuple.IdentifierProperty; +import org.hibernate.tuple.PropertyFactory; +import org.hibernate.tuple.StandardProperty; +import org.hibernate.tuple.VersionProperty; import org.hibernate.type.AbstractComponentType; import org.hibernate.type.AssociationType; import org.hibernate.type.EntityType; @@ -58,6 +56,8 @@ import org.hibernate.type.TypeFactory; import org.hibernate.util.ArrayHelper; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Centralizes metamodel information about an entity. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityTuplizer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityTuplizer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityTuplizer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,12 +27,12 @@ import java.io.Serializable; import java.util.Map; +import org.hibernate.EntityMode; +import org.hibernate.EntityNameResolver; import org.hibernate.HibernateException; -import org.hibernate.EntityNameResolver; -import org.hibernate.EntityMode; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; import org.hibernate.tuple.Tuplizer; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.SessionFactoryImplementor; /** * Defines further responsibilities regarding tuplization based on Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityTuplizerFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityTuplizerFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityTuplizerFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,15 +24,15 @@ */ package org.hibernate.tuple.entity; +import java.io.Serializable; +import java.lang.reflect.Constructor; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.lang.reflect.Constructor; -import java.io.Serializable; -import org.hibernate.util.ReflectHelper; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.mapping.PersistentClass; +import org.hibernate.util.ReflectHelper; /** * A registry allowing users to define the default {@link EntityTuplizer} class to use per {@link EntityMode}. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,22 +31,18 @@ import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.EntityMode; +import org.hibernate.EntityNameResolver; import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.EntityNameResolver; -import org.hibernate.tuple.Instantiator; -import org.hibernate.tuple.PojoInstantiator; import org.hibernate.bytecode.ReflectionOptimizer; import org.hibernate.cfg.Environment; import org.hibernate.classic.Lifecycle; import org.hibernate.classic.Validatable; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.intercept.FieldInterceptionHelper; import org.hibernate.intercept.FieldInterceptor; -import org.hibernate.intercept.FieldInterceptionHelper; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.Subclass; @@ -54,8 +50,12 @@ import org.hibernate.property.Setter; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.ProxyFactory; +import org.hibernate.tuple.Instantiator; +import org.hibernate.tuple.PojoInstantiator; import org.hibernate.type.AbstractComponentType; import org.hibernate.util.ReflectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An {@link EntityTuplizer} specific to the pojo entity mode. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AbstractBynaryType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AbstractBynaryType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AbstractBynaryType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,20 +24,20 @@ */ package org.hibernate.type; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.ResultSet; import java.sql.Types; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.util.Comparator; +import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.EntityMode; +import org.hibernate.cfg.Environment; import org.hibernate.engine.SessionImplementor; -import org.hibernate.cfg.Environment; /** * Logic to bind stream of byte into a VARBINARY Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AbstractCharArrayType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AbstractCharArrayType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AbstractCharArrayType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.type; +import java.io.CharArrayReader; +import java.io.CharArrayWriter; +import java.io.IOException; +import java.io.Reader; +import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.PreparedStatement; import java.sql.Types; -import java.io.Reader; -import java.io.CharArrayWriter; -import java.io.IOException; -import java.io.CharArrayReader; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AssociationType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AssociationType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/AssociationType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.type; +import java.util.Map; + import org.hibernate.MappingException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.persister.entity.Joinable; -import java.util.Map; - /** * A type that represents some kind of association between entities. * @see org.hibernate.engine.Cascade Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/BlobType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/BlobType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/BlobType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -34,16 +34,16 @@ import org.dom4j.Node; import org.hibernate.EntityMode; +import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.Hibernate; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.jdbc.BlobImplementer; -import org.hibernate.engine.jdbc.WrappedBlob; import org.hibernate.engine.jdbc.LobCreator; import org.hibernate.engine.jdbc.NonContextualLobCreator; +import org.hibernate.engine.jdbc.WrappedBlob; import org.hibernate.util.ArrayHelper; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ByteType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ByteType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ByteType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,9 +31,9 @@ import java.sql.Types; import java.util.Comparator; -import org.hibernate.util.ComparableComparator; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; +import org.hibernate.util.ComparableComparator; /** * <tt>byte</tt>: A type that maps an SQL TINYINT to a Java Byte. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CalendarType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CalendarType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CalendarType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -37,8 +37,8 @@ import org.hibernate.EntityMode; import org.hibernate.Hibernate; import org.hibernate.HibernateException; +import org.hibernate.cfg.Environment; import org.hibernate.engine.SessionImplementor; -import org.hibernate.cfg.Environment; import org.hibernate.util.CalendarComparator; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ClobType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ClobType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ClobType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -40,10 +40,10 @@ import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; +import org.hibernate.engine.jdbc.ClobImplementer; import org.hibernate.engine.jdbc.LobCreator; import org.hibernate.engine.jdbc.NonContextualLobCreator; import org.hibernate.engine.jdbc.WrappedClob; -import org.hibernate.engine.jdbc.ClobImplementer; import org.hibernate.util.ArrayHelper; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CollectionType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CollectionType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CollectionType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -36,7 +36,6 @@ import org.dom4j.Element; import org.dom4j.Node; - import org.hibernate.EntityMode; import org.hibernate.Hibernate; import org.hibernate.HibernateException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ComponentType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ComponentType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ComponentType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -42,10 +42,10 @@ import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; +import org.hibernate.tuple.EntityModeToTuplizerMapping; +import org.hibernate.tuple.StandardProperty; +import org.hibernate.tuple.component.ComponentMetamodel; import org.hibernate.tuple.component.ComponentTuplizer; -import org.hibernate.tuple.component.ComponentMetamodel; -import org.hibernate.tuple.StandardProperty; -import org.hibernate.tuple.EntityModeToTuplizerMapping; import org.hibernate.util.ArrayHelper; import org.hibernate.util.StringHelper; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CustomCollectionType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CustomCollectionType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CustomCollectionType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,11 +31,11 @@ import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.collection.PersistentCollection; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.usertype.LoggableUserType; import org.hibernate.usertype.UserCollectionType; -import org.hibernate.usertype.LoggableUserType; /** * A custom type for mapping user-written classes that implement <tt>PersistentCollection</tt> Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CustomType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CustomType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/CustomType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -42,9 +42,9 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.usertype.EnhancedUserType; +import org.hibernate.usertype.LoggableUserType; import org.hibernate.usertype.UserType; import org.hibernate.usertype.UserVersionType; -import org.hibernate.usertype.LoggableUserType; /** * Adapts {@link UserType} to the generic {@link Type} interface, in order Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/DbTimestampType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/DbTimestampType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/DbTimestampType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,15 @@ */ package org.hibernate.type; -import java.sql.Timestamp; +import java.sql.CallableStatement; import java.sql.PreparedStatement; -import java.sql.SQLException; import java.sql.ResultSet; -import java.sql.CallableStatement; +import java.sql.SQLException; +import java.sql.Timestamp; -import org.hibernate.engine.SessionImplementor; import org.hibernate.dialect.Dialect; +import org.hibernate.engine.SessionImplementor; import org.hibernate.exception.JDBCExceptionHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/EmbeddedComponentType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/EmbeddedComponentType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/EmbeddedComponentType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,8 +29,8 @@ import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; +import org.hibernate.tuple.component.ComponentMetamodel; import org.hibernate.tuple.component.ComponentTuplizer; -import org.hibernate.tuple.component.ComponentMetamodel; /** * @author Gavin King Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IdentifierBagType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IdentifierBagType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IdentifierBagType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,8 +28,8 @@ import java.util.ArrayList; import org.hibernate.HibernateException; +import org.hibernate.collection.PersistentCollection; import org.hibernate.collection.PersistentIdentifierBag; -import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.collection.CollectionPersister; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IntegerType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IntegerType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IntegerType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,9 +31,9 @@ import java.sql.Types; import java.util.Comparator; -import org.hibernate.util.ComparableComparator; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; +import org.hibernate.util.ComparableComparator; /** * <tt>integer</tt>: A type that maps an SQL INT to a Java Integer. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/LongType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/LongType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/LongType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,9 +31,9 @@ import java.sql.Types; import java.util.Comparator; -import org.hibernate.util.ComparableComparator; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; +import org.hibernate.util.ComparableComparator; /** * <tt>long</tt>: A type that maps an SQL BIGINT to a Java Long. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/NullableType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/NullableType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/NullableType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,10 +28,7 @@ import java.sql.ResultSet; import java.sql.SQLException; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; import org.dom4j.Node; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.engine.Mapping; @@ -40,6 +37,8 @@ import org.hibernate.util.ArrayHelper; import org.hibernate.util.EqualsHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Superclass of single-column nullable types. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/NumericBooleanType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/NumericBooleanType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/NumericBooleanType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,9 +24,9 @@ */ package org.hibernate.type; +import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.PreparedStatement; import java.sql.Types; import org.hibernate.dialect.Dialect; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ShortType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ShortType.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/ShortType.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -31,9 +31,9 @@ import java.sql.Types; import java.util.Comparator; -import org.hibernate.util.ComparableComparator; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; +import org.hibernate.util.ComparableComparator; /** * <tt>short</tt>: A type that maps an SQL SMALLINT to a Java Short. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/TypeFactory.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/TypeFactory.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/TypeFactory.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -49,8 +49,8 @@ import org.hibernate.property.BackrefPropertyAccessor; import org.hibernate.tuple.StandardProperty; import org.hibernate.usertype.CompositeUserType; +import org.hibernate.usertype.ParameterizedType; import org.hibernate.usertype.UserType; -import org.hibernate.usertype.ParameterizedType; import org.hibernate.util.ReflectHelper; /** Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ConfigHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ConfigHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ConfigHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -32,10 +32,10 @@ import java.net.URL; import java.util.Properties; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Environment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.HibernateException; -import org.hibernate.cfg.Environment; /** * A simple class to centralize logic needed to locate config files on the system. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ExternalSessionFactoryConfig.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ExternalSessionFactoryConfig.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/ExternalSessionFactoryConfig.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,16 +24,16 @@ */ package org.hibernate.util; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; - -import java.util.Properties; +import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.util.Properties; import java.util.Set; -import java.util.HashMap; -import java.util.HashSet; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; + /** * Defines support for various externally configurable SessionFactory(s), for * example, {@link org.hibernate.jmx.HibernateService JMX} or the JCA Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/FilterHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/FilterHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/FilterHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,14 @@ */ package org.hibernate.util; -import org.hibernate.sql.Template; -import org.hibernate.impl.FilterImpl; +import java.util.Iterator; +import java.util.Map; + import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.SQLFunctionRegistry; +import org.hibernate.impl.FilterImpl; +import org.hibernate.sql.Template; -import java.util.Map; -import java.util.Iterator; - /** * Implementation of FilterHelper. * Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/NamingHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/NamingHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/NamingHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -34,11 +34,11 @@ import javax.naming.Name; import javax.naming.NameNotFoundException; import javax.naming.NamingException; + +import org.hibernate.cfg.Environment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.cfg.Environment; - public final class NamingHelper { private static final Logger log = LoggerFactory.getLogger(NamingHelper.class); Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/PropertiesHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/PropertiesHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/PropertiesHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,10 +25,10 @@ package org.hibernate.util; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; -import java.util.Iterator; /** * Collection of helper methods for dealing with {@link java.util.Properties} Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SerializationHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SerializationHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SerializationHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,15 +28,14 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.ObjectStreamClass; import java.io.OutputStream; import java.io.Serializable; -import java.io.ObjectStreamClass; -import java.io.ObjectInputStream; -import org.hibernate.type.SerializationException; import org.hibernate.Hibernate; - +import org.hibernate.type.SerializationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SimpleMRUCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SimpleMRUCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SimpleMRUCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,11 @@ */ package org.hibernate.util; +import java.io.IOException; +import java.io.Serializable; + import org.apache.commons.collections.map.LRUMap; -import java.io.Serializable; -import java.io.IOException; - /** * Cache following a "Most Recently Used" (MRU) algorithm for maintaining a * bounded in-memory size; the "Least Recently Used" (LRU) entry is the first Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SoftLimitMRUCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SoftLimitMRUCache.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/SoftLimitMRUCache.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.util; +import java.io.IOException; +import java.io.Serializable; + +import org.apache.commons.collections.map.LRUMap; import org.apache.commons.collections.map.ReferenceMap; -import org.apache.commons.collections.map.LRUMap; -import java.io.Serializable; -import java.io.IOException; - /** * Cache following a "Most Recently Used" (MRY) algorithm for maintaining a * bounded in-memory size; the "Least Recently Used" (LRU) entry is the first Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/StringHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/StringHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/StringHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,10 +24,10 @@ */ package org.hibernate.util; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; -import java.util.Arrays; public final class StringHelper { Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/XMLHelper.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/XMLHelper.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/XMLHelper.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,14 +26,14 @@ import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.dom4j.DocumentFactory; +import org.dom4j.Element; import org.dom4j.io.DOMReader; +import org.dom4j.io.OutputFormat; import org.dom4j.io.SAXReader; -import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; -import org.dom4j.Element; -import org.dom4j.DocumentFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXParseException; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/cache/QueryKeyTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/cache/QueryKeyTest.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/cache/QueryKeyTest.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,14 +29,14 @@ import junit.framework.TestCase; import org.hibernate.EntityMode; -import org.hibernate.transform.RootEntityResultTransformer; -import org.hibernate.transform.ResultTransformer; +import org.hibernate.transform.AliasToEntityMapResultTransformer; +import org.hibernate.transform.DistinctResultTransformer; import org.hibernate.transform.DistinctRootEntityResultTransformer; -import org.hibernate.transform.AliasToEntityMapResultTransformer; import org.hibernate.transform.PassThroughResultTransformer; -import org.hibernate.transform.DistinctResultTransformer; +import org.hibernate.transform.ResultTransformer; +import org.hibernate.transform.RootEntityResultTransformer; +import org.hibernate.util.ArrayHelper; import org.hibernate.util.SerializationHelper; -import org.hibernate.util.ArrayHelper; /** * Tests relating to {@link QueryKey} instances. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/Mocks.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/Mocks.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/Mocks.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -27,9 +27,9 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import java.sql.SQLException; import java.sql.Connection; import java.sql.DatabaseMetaData; +import java.sql.SQLException; /** * TODO : javadoc Modified: core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/TestingDialects.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/TestingDialects.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/TestingDialects.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,12 +24,12 @@ */ package org.hibernate.dialect; +import java.sql.DatabaseMetaData; import java.sql.SQLException; -import java.sql.DatabaseMetaData; +import org.hibernate.HibernateException; import org.hibernate.dialect.resolver.AbstractDialectResolver; import org.hibernate.dialect.resolver.BasicDialectResolver; -import org.hibernate.HibernateException; /** * TODO : javadoc Modified: core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,32 +24,30 @@ */ package org.hibernate.dialect.resolver; -import java.util.Properties; import java.sql.Connection; +import java.util.Properties; -import junit.framework.TestSuite; -import junit.framework.TestCase; import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; import org.hibernate.HibernateException; -import org.hibernate.dialect.resolver.DialectFactory; -import org.hibernate.dialect.HSQLDialect; +import org.hibernate.cfg.Environment; +import org.hibernate.dialect.DB2Dialect; +import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.H2Dialect; +import org.hibernate.dialect.HSQLDialect; +import org.hibernate.dialect.InformixDialect; +import org.hibernate.dialect.IngresDialect; +import org.hibernate.dialect.Mocks; import org.hibernate.dialect.MySQLDialect; +import org.hibernate.dialect.Oracle10gDialect; +import org.hibernate.dialect.Oracle8iDialect; +import org.hibernate.dialect.Oracle9iDialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.dialect.DerbyDialect; -import org.hibernate.dialect.IngresDialect; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.SybaseASE15Dialect; -import org.hibernate.dialect.SybaseDialect; -import org.hibernate.dialect.InformixDialect; -import org.hibernate.dialect.DB2Dialect; -import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.dialect.Oracle9iDialect; -import org.hibernate.dialect.Oracle10gDialect; import org.hibernate.dialect.TestingDialects; -import org.hibernate.dialect.Mocks; -import org.hibernate.cfg.Environment; /** * TODO : javadoc Modified: core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectResolverTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectResolverTest.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/core/src/test/java/org/hibernate/dialect/resolver/DialectResolverTest.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,13 +26,13 @@ import java.sql.SQLException; -import junit.framework.TestSuite; import junit.framework.Test; import junit.framework.TestCase; +import junit.framework.TestSuite; import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.Mocks; import org.hibernate.dialect.TestingDialects; -import org.hibernate.dialect.Mocks; import org.hibernate.exception.JDBCConnectionException; /** Modified: core/branches/Branch_3_3_2_GA_CP/jdbc3-testing/src/test/java/org/hibernate/engine/jdbc/jdbc3/JdbcSupportTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/jdbc3-testing/src/test/java/org/hibernate/engine/jdbc/jdbc3/JdbcSupportTest.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/jdbc3-testing/src/test/java/org/hibernate/engine/jdbc/jdbc3/JdbcSupportTest.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,20 +23,20 @@ */ package org.hibernate.engine.jdbc.jdbc3; -import java.sql.SQLException; import java.sql.Blob; import java.sql.Clob; +import java.sql.SQLException; import junit.framework.TestCase; +import org.hibernate.engine.jdbc.BlobImplementer; +import org.hibernate.engine.jdbc.ClobImplementer; +import org.hibernate.engine.jdbc.JdbcSupportLoader; import org.hibernate.engine.jdbc.LobCreationContext; import org.hibernate.engine.jdbc.LobCreator; -import org.hibernate.engine.jdbc.JdbcSupportLoader; -import org.hibernate.engine.jdbc.BlobImplementer; +import org.hibernate.engine.jdbc.NClobImplementer; import org.hibernate.engine.jdbc.WrappedBlob; import org.hibernate.engine.jdbc.WrappedClob; -import org.hibernate.engine.jdbc.ClobImplementer; -import org.hibernate.engine.jdbc.NClobImplementer; /** Modified: core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/src/test/java/org/hibernate/engine/jdbc/jdbc4/JdbcSupportTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/src/test/java/org/hibernate/engine/jdbc/jdbc4/JdbcSupportTest.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/src/test/java/org/hibernate/engine/jdbc/jdbc4/JdbcSupportTest.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,23 +23,28 @@ */ package org.hibernate.engine.jdbc.jdbc4; -import java.sql.*; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; import java.io.Writer; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.NClob; +import java.sql.SQLException; import junit.framework.TestCase; +import org.hibernate.engine.jdbc.BlobImplementer; +import org.hibernate.engine.jdbc.ClobImplementer; +import org.hibernate.engine.jdbc.ContextualLobCreator; +import org.hibernate.engine.jdbc.JdbcSupportLoader; import org.hibernate.engine.jdbc.LobCreationContext; import org.hibernate.engine.jdbc.LobCreator; -import org.hibernate.engine.jdbc.JdbcSupportLoader; -import org.hibernate.engine.jdbc.ContextualLobCreator; -import org.hibernate.engine.jdbc.BlobImplementer; -import org.hibernate.engine.jdbc.ClobImplementer; import org.hibernate.engine.jdbc.NClobImplementer; import org.hibernate.engine.jdbc.NonContextualLobCreator; import org.hibernate.engine.jdbc.WrappedBlob; Modified: core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/HibernateService.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/HibernateService.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/HibernateService.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -1,20 +1,19 @@ //$Id: HibernateService.java 6100 2005-03-17 10:48:03Z turin42 $ package org.hibernate.jmx; -import java.util.Properties; import java.util.Map; +import java.util.Properties; import javax.naming.InitialContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; import org.hibernate.tool.hbm2ddl.SchemaExport; -import org.hibernate.util.NamingHelper; import org.hibernate.util.ExternalSessionFactoryConfig; +import org.hibernate.util.NamingHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Modified: core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -12,8 +12,6 @@ import javax.naming.Reference; import javax.naming.StringRefAddr; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.Interceptor; @@ -26,6 +24,8 @@ import org.hibernate.metadata.ClassMetadata; import org.hibernate.metadata.CollectionMetadata; import org.hibernate.stat.Statistics; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A flyweight for <tt>SessionFactory</tt>. If the MBean itself does not Modified: core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/StatisticsService.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/StatisticsService.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/jmx/src/main/java/org/hibernate/jmx/StatisticsService.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -6,8 +6,6 @@ import javax.naming.NamingException; import javax.naming.Reference; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.SessionFactory; import org.hibernate.impl.SessionFactoryObjectFactory; import org.hibernate.stat.CollectionStatistics; @@ -16,6 +14,8 @@ import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.stat.Statistics; import org.hibernate.stat.StatisticsImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JMX service for Hibernate statistics<br> Modified: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/TestSuiteVisitor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/TestSuiteVisitor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/TestSuiteVisitor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -25,8 +25,8 @@ import java.util.Enumeration; +import junit.framework.Test; import junit.framework.TestSuite; -import junit.framework.Test; /** * Handles walking a TestSuite hierarchy for recognition of individual tests. Modified: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/UnitTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/UnitTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/UnitTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -28,14 +28,15 @@ import java.util.Iterator; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * A basic JUnit {@link junit.framework.TestCase} subclass for * adding some Hibernate specific behavior and functionality. Modified: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/ExecutionEnvironment.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/ExecutionEnvironment.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/ExecutionEnvironment.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,20 +23,20 @@ */ package org.hibernate.junit.functional; -import java.util.Iterator; import java.sql.Blob; import java.sql.Clob; +import java.util.Iterator; -import org.hibernate.dialect.Dialect; +import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Mappings; -import org.hibernate.SessionFactory; +import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.SimpleValue; -import org.hibernate.mapping.Collection; /** * {@inheritDoc} Modified: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,24 +23,23 @@ */ package org.hibernate.junit.functional; -import java.util.List; -import java.util.Map; +import java.sql.Connection; import java.util.HashMap; import java.util.Iterator; -import java.sql.Connection; +import java.util.List; +import java.util.Map; +import org.hibernate.HibernateException; +import org.hibernate.Interceptor; +import org.hibernate.Session; +import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Mappings; -import org.hibernate.dialect.Dialect; import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.DerbyDialect; -import org.hibernate.SessionFactory; -import org.hibernate.HibernateException; -import org.hibernate.Interceptor; -import org.hibernate.Session; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionFactoryImplementor; - +import org.hibernate.junit.UnitTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestClassTestSuite.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestClassTestSuite.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestClassTestSuite.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -23,9 +23,9 @@ */ package org.hibernate.junit.functional; -import junit.framework.TestSuite; import junit.framework.Test; import junit.framework.TestResult; +import junit.framework.TestSuite; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -30,12 +30,8 @@ import java.lang.reflect.Modifier; import java.sql.Connection; import java.sql.SQLException; -import java.util.HashSet; -import java.util.Set; import junit.framework.TestCase; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; @@ -46,6 +42,8 @@ import org.hibernate.junit.SkipLog; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A base class for all tests. Modified: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/tm/SimpleJtaTransactionImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/tm/SimpleJtaTransactionImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/tm/SimpleJtaTransactionImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,6 +26,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.LinkedList; + import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; import javax.transaction.RollbackException; Modified: core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/tm/TransactionManagerLookupImpl.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/tm/TransactionManagerLookupImpl.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testing/src/main/java/org/hibernate/test/tm/TransactionManagerLookupImpl.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,11 +24,12 @@ package org.hibernate.test.tm; import java.util.Properties; + +import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import javax.transaction.Transaction; +import org.hibernate.HibernateException; import org.hibernate.transaction.TransactionManagerLookup; -import org.hibernate.HibernateException; /** * TransactionManagerLookupImpl implementation Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/criteria/LikeTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/criteria/LikeTest.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/criteria/LikeTest.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -29,7 +29,6 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; -import org.hibernate.dialect.MySQLDialect; import org.hibernate.junit.functional.FunctionalTestCase; Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/LobHolder.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/LobHolder.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/lob/LobHolder.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -1,8 +1,8 @@ package org.hibernate.test.lob; import java.io.Serializable; +import java.sql.Blob; import java.sql.Clob; -import java.sql.Blob; /** * An entity containing all kinds of good LOB-type data... Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -24,14 +24,10 @@ */ package org.hibernate.test.queryplan; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import org.hibernate.engine.query.QueryPlanCache; import org.hibernate.engine.query.NativeSQLQueryPlan; -import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; +import org.hibernate.engine.query.QueryPlanCache; import org.hibernate.engine.query.sql.NativeSQLQueryReturn; +import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; import org.hibernate.junit.functional.FunctionalTestCase; import org.hibernate.type.TypeFactory; Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -26,13 +26,8 @@ import java.util.Collections; import java.util.HashMap; -import java.util.Map; import org.hibernate.LockMode; -import org.hibernate.Session; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.query.HQLQueryPlan; -import org.hibernate.engine.query.QueryPlanCache; import org.hibernate.engine.query.sql.NativeSQLQueryCollectionReturn; import org.hibernate.engine.query.sql.NativeSQLQueryJoinReturn; import org.hibernate.engine.query.sql.NativeSQLQueryReturn; Modified: core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/domain/Event.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/domain/Event.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/domain/Event.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -1,6 +1,8 @@ package org.hibernate.tutorial.domain; -import java.util.*; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; public class Event { private Long id; Modified: core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/domain/Person.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/domain/Person.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/domain/Person.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -1,6 +1,7 @@ package org.hibernate.tutorial.domain; -import java.util.*; +import java.util.HashSet; +import java.util.Set; public class Person { Modified: core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/web/EventManagerServlet.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/web/EventManagerServlet.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/web/EventManagerServlet.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -6,6 +6,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; + import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; Modified: core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/web/SessionInterceptor.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/web/SessionInterceptor.java 2010-08-04 05:29:30 UTC (rev 20104) +++ core/branches/Branch_3_3_2_GA_CP/tutorials/web/src/main/java/org/hibernate/tutorial/web/SessionInterceptor.java 2010-08-04 05:41:23 UTC (rev 20105) @@ -1,6 +1,7 @@ package org.hibernate.tutorial.web; import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -8,12 +9,11 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.classic.Session; import org.hibernate.context.ManagedSessionContext; import org.hibernate.tutorial.util.HibernateUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Illustrates a servlet filter used to apply a Hibernate session