Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6155 - Migrate o.h.impl package to o.h.internal

This commit is contained in:
Steve Ebersole 2011-04-24 09:24:32 -05:00
parent 85094bddbf
commit ff74ceaaa4
59 changed files with 203 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/cache/FilterKey.java vendored
View File

@ -31,7 +31,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.hibernate.EntityMode; import org.hibernate.EntityMode;
import org.hibernate.engine.TypedValue; import org.hibernate.engine.TypedValue;
import org.hibernate.impl.FilterImpl; import org.hibernate.internal.FilterImpl;
import org.hibernate.type.Type; import org.hibernate.type.Type;
/** /**

272
hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java vendored
View File

@ -1,137 +1,137 @@
/* /*
* Hibernate, Relational Persistence for Idiomatic Java * Hibernate, Relational Persistence for Idiomatic Java
* *
* Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
* indicated by the @author tags or express copyright attribution * indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are * statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Middleware LLC. * distributed under license by Red Hat Middleware LLC.
* *
* This copyrighted material is made available to anyone wishing to use, modify, * This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU * copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation. * Lesser General Public License, as published by the Free Software Foundation.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details. * for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to: * along with this distribution; if not, write to:
* Free Software Foundation, Inc. * Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
* *
*/ */
package org.hibernate.cache; package org.hibernate.cache;
import java.util.Properties; import java.util.Properties;
import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.AccessType;
import org.hibernate.cfg.Settings; import org.hibernate.cfg.Settings;
/** /**
* Contract for building second level cache regions. * Contract for building second level cache regions.
* <p/> * <p/>
* Implementors should define a constructor in one of two forms:<ul> * Implementors should define a constructor in one of two forms:<ul>
* <li>MyRegionFactoryImpl({@link java.util.Properties})</li> * <li>MyRegionFactoryImpl({@link java.util.Properties})</li>
* <li>MyRegionFactoryImpl()</li> * <li>MyRegionFactoryImpl()</li>
* </ul> * </ul>
* Use the first when we need to read config properties prior to * Use the first when we need to read config properties prior to
* {@link #start} being called. For an example, have a look at * {@link #start} being called. For an example, have a look at
* {@link org.hibernate.cache.impl.bridge.RegionFactoryCacheProviderBridge} * {@link org.hibernate.cache.impl.bridge.RegionFactoryCacheProviderBridge}
* where we need the properties in order to determine which legacy * where we need the properties in order to determine which legacy
* {@link CacheProvider} to use so that we can answer the * {@link CacheProvider} to use so that we can answer the
* {@link #isMinimalPutsEnabledByDefault()} question for the * {@link #isMinimalPutsEnabledByDefault()} question for the
* {@link org.hibernate.cfg.SettingsFactory}. * {@link org.hibernate.cfg.SettingsFactory}.
* *
* @author Steve Ebersole * @author Steve Ebersole
*/ */
public interface RegionFactory { public interface RegionFactory {
/** /**
* Lifecycle callback to perform any necessary initialization of the * Lifecycle callback to perform any necessary initialization of the
* underlying cache implementation(s). Called exactly once during the * underlying cache implementation(s). Called exactly once during the
* construction of a {@link org.hibernate.impl.SessionFactoryImpl}. * construction of a {@link org.hibernate.internal.SessionFactoryImpl}.
* *
* @param settings The settings in effect. * @param settings The settings in effect.
* @param properties The defined cfg properties * @param properties The defined cfg properties
* @throws CacheException Indicates problems starting the L2 cache impl; * @throws CacheException Indicates problems starting the L2 cache impl;
* considered as a sign to stop {@link org.hibernate.SessionFactory} * considered as a sign to stop {@link org.hibernate.SessionFactory}
* building. * building.
*/ */
public void start(Settings settings, Properties properties) throws CacheException; public void start(Settings settings, Properties properties) throws CacheException;
/** /**
* Lifecycle callback to perform any necessary cleanup of the underlying * Lifecycle callback to perform any necessary cleanup of the underlying
* cache implementation(s). Called exactly once during * cache implementation(s). Called exactly once during
* {@link org.hibernate.SessionFactory#close}. * {@link org.hibernate.SessionFactory#close}.
*/ */
public void stop(); public void stop();
/** /**
* By default should we perform "minimal puts" when using this second * By default should we perform "minimal puts" when using this second
* level cache implementation? * level cache implementation?
* *
* @return True if "minimal puts" should be performed by default; false * @return True if "minimal puts" should be performed by default; false
* otherwise. * otherwise.
*/ */
public boolean isMinimalPutsEnabledByDefault(); public boolean isMinimalPutsEnabledByDefault();
/** /**
* Get the default access type for {@link EntityRegion entity} and * Get the default access type for {@link EntityRegion entity} and
* {@link CollectionRegion collection} regions. * {@link CollectionRegion collection} regions.
* *
* @return This factory's default access type. * @return This factory's default access type.
*/ */
public AccessType getDefaultAccessType(); public AccessType getDefaultAccessType();
/** /**
* Generate a timestamp. * Generate a timestamp.
* <p/> * <p/>
* This is generally used for cache content locking/unlocking purposes * This is generally used for cache content locking/unlocking purposes
* depending upon the access-strategy being used. * depending upon the access-strategy being used.
* *
* @return The generated timestamp. * @return The generated timestamp.
*/ */
public long nextTimestamp(); public long nextTimestamp();
/** /**
* Build a cache region specialized for storing entity data. * Build a cache region specialized for storing entity data.
* *
* @param regionName The name of the region. * @param regionName The name of the region.
* @param properties Configuration properties. * @param properties Configuration properties.
* @param metadata Information regarding the type of data to be cached * @param metadata Information regarding the type of data to be cached
* @return The built region * @return The built region
* @throws CacheException Indicates problems building the region. * @throws CacheException Indicates problems building the region.
*/ */
public EntityRegion buildEntityRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException; public EntityRegion buildEntityRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException;
/** /**
* Build a cache region specialized for storing collection data. * Build a cache region specialized for storing collection data.
* *
* @param regionName The name of the region. * @param regionName The name of the region.
* @param properties Configuration properties. * @param properties Configuration properties.
* @param metadata Information regarding the type of data to be cached * @param metadata Information regarding the type of data to be cached
* @return The built region * @return The built region
* @throws CacheException Indicates problems building the region. * @throws CacheException Indicates problems building the region.
*/ */
public CollectionRegion buildCollectionRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException; public CollectionRegion buildCollectionRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException;
/** /**
* Build a cache region specialized for storing query results * Build a cache region specialized for storing query results
* *
* @param regionName The name of the region. * @param regionName The name of the region.
* @param properties Configuration properties. * @param properties Configuration properties.
* @return The built region * @return The built region
* @throws CacheException Indicates problems building the region. * @throws CacheException Indicates problems building the region.
*/ */
public QueryResultsRegion buildQueryResultsRegion(String regionName, Properties properties) throws CacheException; public QueryResultsRegion buildQueryResultsRegion(String regionName, Properties properties) throws CacheException;
/** /**
* Build a cache region specialized for storing update-timestamps data. * Build a cache region specialized for storing update-timestamps data.
* *
* @param regionName The name of the region. * @param regionName The name of the region.
* @param properties Configuration properties. * @param properties Configuration properties.
* @return The built region * @return The built region
* @throws CacheException Indicates problems building the region. * @throws CacheException Indicates problems building the region.
*/ */
public TimestampsRegion buildTimestampsRegion(String regionName, Properties properties) throws CacheException; public TimestampsRegion buildTimestampsRegion(String regionName, Properties properties) throws CacheException;
} }

2
hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
View File

@ -93,7 +93,7 @@ import org.hibernate.id.IdentifierGeneratorAggregator;
import org.hibernate.id.PersistentIdentifierGenerator; import org.hibernate.id.PersistentIdentifierGenerator;
import org.hibernate.id.factory.DefaultIdentifierGeneratorFactory; import org.hibernate.id.factory.DefaultIdentifierGeneratorFactory;
import org.hibernate.id.factory.IdentifierGeneratorFactory; import org.hibernate.id.factory.IdentifierGeneratorFactory;
import org.hibernate.impl.SessionFactoryImpl; import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.internal.util.ConfigHelper; import org.hibernate.internal.util.ConfigHelper;
import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.SerializationHelper; import org.hibernate.internal.util.SerializationHelper;

2
hibernate-core/src/main/java/org/hibernate/criterion/DetachedCriteria.java
View File

@ -30,7 +30,7 @@ import org.hibernate.HibernateException;
import org.hibernate.LockMode; import org.hibernate.LockMode;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.SessionImplementor;
import org.hibernate.impl.CriteriaImpl; import org.hibernate.internal.CriteriaImpl;
import org.hibernate.transform.ResultTransformer; import org.hibernate.transform.ResultTransformer;
/** /**

2
hibernate-core/src/main/java/org/hibernate/criterion/SubqueryExpression.java
View File

@ -30,7 +30,7 @@ import org.hibernate.engine.QueryParameters;
import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.SessionImplementor;
import org.hibernate.engine.TypedValue; import org.hibernate.engine.TypedValue;
import org.hibernate.impl.CriteriaImpl; import org.hibernate.internal.CriteriaImpl;
import org.hibernate.loader.criteria.CriteriaJoinWalker; import org.hibernate.loader.criteria.CriteriaJoinWalker;
import org.hibernate.loader.criteria.CriteriaQueryTranslator; import org.hibernate.loader.criteria.CriteriaQueryTranslator;
import org.hibernate.persister.entity.OuterJoinLoadable; import org.hibernate.persister.entity.OuterJoinLoadable;

2
hibernate-core/src/main/java/org/hibernate/engine/LoadQueryInfluencers.java
View File

@ -31,7 +31,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.hibernate.Filter; import org.hibernate.Filter;
import org.hibernate.UnknownProfileException; import org.hibernate.UnknownProfileException;
import org.hibernate.impl.FilterImpl; import org.hibernate.internal.FilterImpl;
import org.hibernate.type.Type; import org.hibernate.type.Type;
/** /**

2
hibernate-core/src/main/java/org/hibernate/engine/Mapping.java
View File

@ -33,7 +33,7 @@ import org.hibernate.type.Type;
* implementors of <tt>Type</tt>. * implementors of <tt>Type</tt>.
* *
* @see org.hibernate.type.Type * @see org.hibernate.type.Type
* @see org.hibernate.impl.SessionFactoryImpl * @see org.hibernate.internal.SessionFactoryImpl
* @see org.hibernate.cfg.Configuration * @see org.hibernate.cfg.Configuration
* @author Gavin King * @author Gavin King
*/ */

2
hibernate-core/src/main/java/org/hibernate/engine/QueryParameters.java
View File

@ -38,7 +38,7 @@ import org.hibernate.QueryException;
import org.hibernate.ScrollMode; import org.hibernate.ScrollMode;
import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Dialect;
import org.hibernate.hql.classic.ParserHelper; import org.hibernate.hql.classic.ParserHelper;
import org.hibernate.impl.FilterImpl; import org.hibernate.internal.FilterImpl;
import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.pretty.Printer; import org.hibernate.pretty.Printer;
import org.hibernate.transform.ResultTransformer; import org.hibernate.transform.ResultTransformer;

7
hibernate-core/src/main/java/org/hibernate/engine/SessionFactoryImplementor.java
View File

@ -24,15 +24,13 @@
*/ */
package org.hibernate.engine; package org.hibernate.engine;
import java.sql.Connection;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import org.hibernate.ConnectionReleaseMode;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.Interceptor; import org.hibernate.Interceptor;
import org.hibernate.MappingException; import org.hibernate.MappingException;
import org.hibernate.MultiTenancyStrategy;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.SessionFactoryObserver; import org.hibernate.SessionFactoryObserver;
@ -51,7 +49,6 @@ import org.hibernate.id.IdentifierGenerator;
import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.proxy.EntityNotFoundDelegate; import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.stat.spi.StatisticsImplementor; import org.hibernate.stat.spi.StatisticsImplementor;
@ -63,7 +60,7 @@ import org.hibernate.type.TypeResolver;
* Hibernate such as implementors of <tt>Type</tt>. * Hibernate such as implementors of <tt>Type</tt>.
* *
* @see org.hibernate.SessionFactory * @see org.hibernate.SessionFactory
* @see org.hibernate.impl.SessionFactoryImpl * @see org.hibernate.internal.SessionFactoryImpl
* @author Gavin King * @author Gavin King
*/ */
public interface SessionFactoryImplementor extends Mapping, SessionFactory { public interface SessionFactoryImplementor extends Mapping, SessionFactory {

5
hibernate-core/src/main/java/org/hibernate/engine/SessionImplementor.java
View File

@ -42,8 +42,7 @@ import org.hibernate.engine.jdbc.LobCreationContext;
import org.hibernate.engine.jdbc.spi.JdbcConnectionAccess; import org.hibernate.engine.jdbc.spi.JdbcConnectionAccess;
import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; import org.hibernate.engine.query.sql.NativeSQLQuerySpecification;
import org.hibernate.engine.transaction.spi.TransactionCoordinator; import org.hibernate.engine.transaction.spi.TransactionCoordinator;
import org.hibernate.event.EventListeners; import org.hibernate.internal.CriteriaImpl;
import org.hibernate.impl.CriteriaImpl;
import org.hibernate.loader.custom.CustomQuery; import org.hibernate.loader.custom.CustomQuery;
import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.type.Type; import org.hibernate.type.Type;
@ -278,7 +277,7 @@ public interface SessionImplementor extends Serializable, LobCreationContext {
/** /**
* Return the currently enabled filters. The filter map is keyed by filter * Return the currently enabled filters. The filter map is keyed by filter
* name, with values corresponding to the {@link org.hibernate.impl.FilterImpl} * name, with values corresponding to the {@link org.hibernate.internal.FilterImpl}
* instance. * instance.
* @return The currently enabled filters. * @return The currently enabled filters.
* @deprecated use #getLoadQueryInfluencers instead * @deprecated use #getLoadQueryInfluencers instead

2
hibernate-core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java
View File

@ -38,7 +38,7 @@ import org.hibernate.QueryException;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; import org.hibernate.engine.query.sql.NativeSQLQuerySpecification;
import org.hibernate.impl.FilterImpl; import org.hibernate.internal.FilterImpl;
import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.internal.util.collections.CollectionHelper;
import org.hibernate.internal.util.collections.SimpleMRUCache; import org.hibernate.internal.util.collections.SimpleMRUCache;
import org.hibernate.internal.util.collections.SoftLimitMRUCache; import org.hibernate.internal.util.collections.SoftLimitMRUCache;

2
hibernate-core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java
View File

@ -43,7 +43,7 @@ import org.hibernate.hql.ast.tree.FromElement;
import org.hibernate.hql.ast.tree.ParameterContainer; import org.hibernate.hql.ast.tree.ParameterContainer;
import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.hql.ast.tree.QueryNode;
import org.hibernate.hql.classic.ParserHelper; import org.hibernate.hql.classic.ParserHelper;
import org.hibernate.impl.FilterImpl; import org.hibernate.internal.FilterImpl;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.param.DynamicFilterParameterSpecification; import org.hibernate.param.DynamicFilterParameterSpecification;

2
hibernate-core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java
View File

@ -55,7 +55,7 @@ import org.hibernate.hql.FilterTranslator;
import org.hibernate.hql.HolderInstantiator; import org.hibernate.hql.HolderInstantiator;
import org.hibernate.hql.NameGenerator; import org.hibernate.hql.NameGenerator;
import org.hibernate.hql.ParameterTranslations; import org.hibernate.hql.ParameterTranslations;
import org.hibernate.impl.IteratorImpl; import org.hibernate.internal.IteratorImpl;
import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.ArrayHelper;

2
hibernate-core/src/main/java/org/hibernate/impl/AbstractQueryImpl.java → hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;

3
hibernate-core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java → hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
@ -43,7 +43,6 @@ import org.hibernate.ScrollableResults;
import org.hibernate.engine.QueryParameters; import org.hibernate.engine.QueryParameters;
import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.SessionImplementor;
import org.hibernate.hql.HolderInstantiator; import org.hibernate.hql.HolderInstantiator;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.loader.Loader; import org.hibernate.loader.Loader;
import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.StandardBasicTypes;
import org.hibernate.type.Type; import org.hibernate.type.Type;

2
hibernate-core/src/main/java/org/hibernate/impl/AbstractSessionImpl.java → hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Connection; import java.sql.Connection;

2
hibernate-core/src/main/java/org/hibernate/impl/CollectionFilterImpl.java → hibernate-core/src/main/java/org/hibernate/internal/CollectionFilterImpl.java
View File

@ -22,7 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
* *
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

2
hibernate-core/src/main/java/org/hibernate/impl/ConnectionObserverStatsBridge.java → hibernate-core/src/main/java/org/hibernate/internal/ConnectionObserverStatsBridge.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.jdbc.spi.ConnectionObserver; import org.hibernate.engine.jdbc.spi.ConnectionObserver;

2
hibernate-core/src/main/java/org/hibernate/impl/CriteriaImpl.java → hibernate-core/src/main/java/org/hibernate/internal/CriteriaImpl.java
View File

@ -22,7 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
* *
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
hibernate-core/src/main/java/org/hibernate/impl/FetchingScrollableResultsImpl.java → hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;

2
hibernate-core/src/main/java/org/hibernate/impl/FilterHelper.java → hibernate-core/src/main/java/org/hibernate/internal/FilterHelper.java
View File

@ -22,7 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
* *
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;

2
hibernate-core/src/main/java/org/hibernate/impl/FilterImpl.java → hibernate-core/src/main/java/org/hibernate/internal/FilterImpl.java
View File

@ -22,7 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
* *
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.io.Serializable; import java.io.Serializable;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;

3
hibernate-core/src/main/java/org/hibernate/impl/IteratorImpl.java → hibernate-core/src/main/java/org/hibernate/internal/IteratorImpl.java
View File

@ -22,13 +22,12 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
* *
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.JDBCException; import org.hibernate.JDBCException;
import org.hibernate.engine.HibernateIterator; import org.hibernate.engine.HibernateIterator;
import org.hibernate.event.EventSource; import org.hibernate.event.EventSource;

3
hibernate-core/src/main/java/org/hibernate/impl/NonFlushedChangesImpl.java → hibernate-core/src/main/java/org/hibernate/internal/NonFlushedChangesImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
@ -30,7 +30,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.hibernate.AssertionFailure; import org.hibernate.AssertionFailure;
import org.hibernate.EntityMode; import org.hibernate.EntityMode;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.engine.ActionQueue; import org.hibernate.engine.ActionQueue;
import org.hibernate.engine.NonFlushedChanges; import org.hibernate.engine.NonFlushedChanges;
import org.hibernate.engine.StatefulPersistenceContext; import org.hibernate.engine.StatefulPersistenceContext;

2
hibernate-core/src/main/java/org/hibernate/impl/QueryImpl.java → hibernate-core/src/main/java/org/hibernate/internal/QueryImpl.java
View File

@ -22,7 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
* *
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

2
hibernate-core/src/main/java/org/hibernate/impl/SQLQueryImpl.java → hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

2
hibernate-core/src/main/java/org/hibernate/impl/ScrollableResultsImpl.java → hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;

3
hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java → hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import javax.naming.NamingException; import javax.naming.NamingException;
import javax.naming.Reference; import javax.naming.Reference;
@ -103,7 +103,6 @@ import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.UUIDGenerator; import org.hibernate.id.UUIDGenerator;
import org.hibernate.id.factory.IdentifierGeneratorFactory; import org.hibernate.id.factory.IdentifierGeneratorFactory;
import org.hibernate.integrator.spi.Integrator; import org.hibernate.integrator.spi.Integrator;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.internal.util.collections.CollectionHelper;
import org.hibernate.internal.util.collections.EmptyIterator; import org.hibernate.internal.util.collections.EmptyIterator;

3
hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java → hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryObjectFactory.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Iterator; import java.util.Iterator;
import java.util.Properties; import java.util.Properties;
@ -38,7 +38,6 @@ import javax.naming.event.NamingExceptionEvent;
import javax.naming.event.NamingListener; import javax.naming.event.NamingListener;
import javax.naming.spi.ObjectFactory; import javax.naming.spi.ObjectFactory;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.internal.util.jndi.JndiHelper; import org.hibernate.internal.util.jndi.JndiHelper;

2
hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryObserverChain.java → hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryObserverChain.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

3
hibernate-core/src/main/java/org/hibernate/impl/SessionImpl.java → hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -56,7 +56,6 @@ import org.hibernate.Filter;
import org.hibernate.FlushMode; import org.hibernate.FlushMode;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.SessionBuilder; import org.hibernate.SessionBuilder;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.Interceptor; import org.hibernate.Interceptor;
import org.hibernate.LobHelper; import org.hibernate.LobHelper;
import org.hibernate.LockMode; import org.hibernate.LockMode;

3
hibernate-core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java → hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Connection; import java.sql.Connection;
@ -40,7 +40,6 @@ import org.hibernate.EmptyInterceptor;
import org.hibernate.EntityMode; import org.hibernate.EntityMode;
import org.hibernate.FlushMode; import org.hibernate.FlushMode;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.Interceptor; import org.hibernate.Interceptor;
import org.hibernate.LockMode; import org.hibernate.LockMode;
import org.hibernate.MappingException; import org.hibernate.MappingException;

2
hibernate-core/src/main/java/org/hibernate/impl/TransactionEnvironmentImpl.java → hibernate-core/src/main/java/org/hibernate/internal/TransactionEnvironmentImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.JdbcServices;

2
hibernate-core/src/main/java/org/hibernate/impl/TypeLocatorImpl.java → hibernate-core/src/main/java/org/hibernate/internal/TypeLocatorImpl.java
View File

@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor * 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.impl; package org.hibernate.internal;
import java.io.Serializable; import java.io.Serializable;
import java.util.Properties; import java.util.Properties;
import org.hibernate.TypeHelper; import org.hibernate.TypeHelper;

10
hibernate-core/src/main/java/org/hibernate/impl/package.html → hibernate-core/src/main/java/org/hibernate/internal/package.html
View File

@ -1,10 +1,10 @@
<!-- <!--
~ Hibernate, Relational Persistence for Idiomatic Java ~ Hibernate, Relational Persistence for Idiomatic Java
~ ~
~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as ~ Copyright (c) 2008-2011, Red Hat Inc. or third-party contributors as
~ indicated by the @author tags or express copyright attribution ~ indicated by the @author tags or express copyright attribution
~ statements applied by the authors. All third-party contributions are ~ statements applied by the authors. All third-party contributions are
~ distributed under license by Red Hat Middleware LLC. ~ distributed under license by Red Hat Inc.
~ ~
~ This copyrighted material is made available to anyone wishing to use, modify, ~ This copyrighted material is made available to anyone wishing to use, modify,
~ copy, or redistribute it subject to the terms and conditions of the GNU ~ copy, or redistribute it subject to the terms and conditions of the GNU
@ -20,15 +20,13 @@
~ Free Software Foundation, Inc. ~ Free Software Foundation, Inc.
~ 51 Franklin Street, Fifth Floor ~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA ~ Boston, MA 02110-1301 USA
~
--> -->
<html> <html>
<head></head> <head></head>
<body> <body>
<p> <p>
This package contains implementations of the An internal package containing mostly implementations of central Hibernate APIs of the
central Hibernate APIs, especially the {@link org.hibernate} package.
Hibernate session.
</body> </body>
</html> </html>

2
hibernate-core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java
View File

@ -47,7 +47,7 @@ import org.hibernate.TypeHelper;
import org.hibernate.engine.FilterDefinition; import org.hibernate.engine.FilterDefinition;
import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.IdentifierGenerator;
import org.hibernate.id.UUIDGenerator; import org.hibernate.id.UUIDGenerator;
import org.hibernate.impl.SessionFactoryObjectFactory; import org.hibernate.internal.SessionFactoryObjectFactory;
import org.hibernate.metadata.ClassMetadata; import org.hibernate.metadata.ClassMetadata;
import org.hibernate.metadata.CollectionMetadata; import org.hibernate.metadata.CollectionMetadata;
import org.hibernate.stat.Statistics; import org.hibernate.stat.Statistics;

2
hibernate-core/src/main/java/org/hibernate/jmx/StatisticsService.java
View File

@ -7,7 +7,7 @@ import javax.naming.Reference;
import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.impl.SessionFactoryObjectFactory; import org.hibernate.internal.SessionFactoryObjectFactory;
import org.hibernate.stat.CollectionStatistics; import org.hibernate.stat.CollectionStatistics;
import org.hibernate.stat.EntityStatistics; import org.hibernate.stat.EntityStatistics;
import org.hibernate.stat.QueryStatistics; import org.hibernate.stat.QueryStatistics;

4
hibernate-core/src/main/java/org/hibernate/loader/Loader.java
View File

@ -69,8 +69,8 @@ import org.hibernate.event.EventSource;
import org.hibernate.event.PostLoadEvent; import org.hibernate.event.PostLoadEvent;
import org.hibernate.event.PreLoadEvent; import org.hibernate.event.PreLoadEvent;
import org.hibernate.hql.HolderInstantiator; import org.hibernate.hql.HolderInstantiator;
import org.hibernate.impl.FetchingScrollableResultsImpl; import org.hibernate.internal.FetchingScrollableResultsImpl;
import org.hibernate.impl.ScrollableResultsImpl; import org.hibernate.internal.ScrollableResultsImpl;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;
import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.EntityPersister;

2
hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java
View File

@ -34,7 +34,7 @@ import org.hibernate.MappingException;
import org.hibernate.engine.CascadeStyle; import org.hibernate.engine.CascadeStyle;
import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.LoadQueryInfluencers;
import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.impl.CriteriaImpl; import org.hibernate.internal.CriteriaImpl;
import org.hibernate.loader.AbstractEntityJoinWalker; import org.hibernate.loader.AbstractEntityJoinWalker;
import org.hibernate.loader.PropertyPath; import org.hibernate.loader.PropertyPath;
import org.hibernate.persister.entity.Joinable; import org.hibernate.persister.entity.Joinable;

2
hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java
View File

@ -40,7 +40,7 @@ import org.hibernate.engine.LoadQueryInfluencers;
import org.hibernate.engine.QueryParameters; import org.hibernate.engine.QueryParameters;
import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.SessionImplementor;
import org.hibernate.impl.CriteriaImpl; import org.hibernate.internal.CriteriaImpl;
import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.loader.OuterJoinLoader; import org.hibernate.loader.OuterJoinLoader;
import org.hibernate.persister.entity.Lockable; import org.hibernate.persister.entity.Lockable;

3
hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java
View File

@ -49,14 +49,13 @@ import org.hibernate.engine.RowSelection;
import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.TypedValue; import org.hibernate.engine.TypedValue;
import org.hibernate.hql.ast.util.SessionFactoryHelper; import org.hibernate.hql.ast.util.SessionFactoryHelper;
import org.hibernate.impl.CriteriaImpl; import org.hibernate.internal.CriteriaImpl;
import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.persister.entity.Loadable; import org.hibernate.persister.entity.Loadable;
import org.hibernate.persister.entity.PropertyMapping; import org.hibernate.persister.entity.PropertyMapping;
import org.hibernate.persister.entity.Queryable; import org.hibernate.persister.entity.Queryable;
import org.hibernate.type.AssociationType; import org.hibernate.type.AssociationType;
import org.hibernate.type.CollectionType; import org.hibernate.type.CollectionType;
import org.hibernate.type.ComponentType;
import org.hibernate.type.StringRepresentableType; import org.hibernate.type.StringRepresentableType;
import org.hibernate.type.Type; import org.hibernate.type.Type;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;

2
hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java
View File

@ -48,7 +48,7 @@ import org.hibernate.hql.ast.tree.AggregatedSelectExpression;
import org.hibernate.hql.ast.tree.FromElement; import org.hibernate.hql.ast.tree.FromElement;
import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.hql.ast.tree.QueryNode;
import org.hibernate.hql.ast.tree.SelectClause; import org.hibernate.hql.ast.tree.SelectClause;
import org.hibernate.impl.IteratorImpl; import org.hibernate.internal.IteratorImpl;
import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.loader.BasicLoader; import org.hibernate.loader.BasicLoader;
import org.hibernate.param.ParameterSpecification; import org.hibernate.param.ParameterSpecification;

2
hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
View File

@ -61,7 +61,7 @@ import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.exception.SQLExceptionConverter;
import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.IdentifierGenerator;
import org.hibernate.impl.FilterHelper; import org.hibernate.internal.FilterHelper;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.jdbc.Expectation; import org.hibernate.jdbc.Expectation;

2
hibernate-core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java
View File

@ -28,7 +28,7 @@ import org.hibernate.FlushMode;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.SessionImplementor;
import org.hibernate.impl.AbstractQueryImpl; import org.hibernate.internal.AbstractQueryImpl;
import org.hibernate.loader.collection.CollectionInitializer; import org.hibernate.loader.collection.CollectionInitializer;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;

2
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -76,7 +76,7 @@ import org.hibernate.id.PostInsertIdentifierGenerator;
import org.hibernate.id.PostInsertIdentityPersister; import org.hibernate.id.PostInsertIdentityPersister;
import org.hibernate.id.insert.Binder; import org.hibernate.id.insert.Binder;
import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate;
import org.hibernate.impl.FilterHelper; import org.hibernate.internal.FilterHelper;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.jdbc.Expectation; import org.hibernate.jdbc.Expectation;

2
hibernate-core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java
View File

@ -31,7 +31,7 @@ import org.hibernate.FlushMode;
import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.LockOptions; import org.hibernate.LockOptions;
import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.SessionImplementor;
import org.hibernate.impl.AbstractQueryImpl; import org.hibernate.internal.AbstractQueryImpl;
import org.hibernate.loader.entity.UniqueEntityLoader; import org.hibernate.loader.entity.UniqueEntityLoader;
/** /**

2
hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java
View File

@ -38,7 +38,7 @@ import org.hibernate.cfg.ObjectNameNormalizer;
import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.H2Dialect;
import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.impl.SessionImpl; import org.hibernate.internal.SessionImpl;
import org.hibernate.jdbc.Work; import org.hibernate.jdbc.Work;
import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject; import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject;
import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;

2
hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java
View File

@ -38,7 +38,7 @@ import org.hibernate.cfg.ObjectNameNormalizer;
import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.H2Dialect;
import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.impl.SessionImpl; import org.hibernate.internal.SessionImpl;
import org.hibernate.jdbc.Work; import org.hibernate.jdbc.Work;
import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject; import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject;
import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;

2
hibernate-core/src/test/java/org/hibernate/id/TableHiLoGeneratorTest.java
View File

@ -38,7 +38,7 @@ import org.hibernate.cfg.ObjectNameNormalizer;
import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.H2Dialect;
import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.impl.SessionImpl; import org.hibernate.internal.SessionImpl;
import org.hibernate.jdbc.Work; import org.hibernate.jdbc.Work;
import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject; import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject;
import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;

1
hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
View File

@ -13,7 +13,6 @@ import org.hibernate.Session;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory; import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.impl.SessionImpl;
import org.hibernate.internal.util.SerializationHelper; import org.hibernate.internal.util.SerializationHelper;
import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;

2
hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java
View File

@ -30,7 +30,7 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
import org.hibernate.criterion.Projections; import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Restrictions;
import org.hibernate.impl.SessionFactoryImpl; import org.hibernate.internal.SessionFactoryImpl;
import org.junit.Test; import org.junit.Test;

2
hibernate-core/src/test/java/org/hibernate/test/legacy/ParentChildTest.java
View File

@ -49,7 +49,7 @@ import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.IngresDialect; import org.hibernate.dialect.IngresDialect;
import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.MySQLDialect;
import org.hibernate.engine.EntityEntry; import org.hibernate.engine.EntityEntry;
import org.hibernate.impl.SessionImpl; import org.hibernate.internal.SessionImpl;
import org.hibernate.jdbc.AbstractWork; import org.hibernate.jdbc.AbstractWork;
import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.HibernateProxy;
import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.StandardBasicTypes;

2
hibernate-core/src/test/java/org/hibernate/test/proxy/ProxyTest.java
View File

@ -35,7 +35,7 @@ import org.hibernate.Session;
import org.hibernate.Transaction; import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
import org.hibernate.impl.SessionImpl; import org.hibernate.internal.SessionImpl;
import org.hibernate.internal.util.SerializationHelper; import org.hibernate.internal.util.SerializationHelper;
import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.HibernateProxy;

2
hibernate-core/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java
View File

@ -43,7 +43,7 @@ import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections; import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Property; import org.hibernate.criterion.Property;
import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Restrictions;
import org.hibernate.impl.SessionFactoryImpl; import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.HibernateProxy;
import org.hibernate.transform.AliasToBeanConstructorResultTransformer; import org.hibernate.transform.AliasToBeanConstructorResultTransformer;

8
hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java
View File

@ -54,7 +54,7 @@ import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.query.NamedParameterDescriptor; import org.hibernate.engine.query.NamedParameterDescriptor;
import org.hibernate.engine.query.OrdinalParameterDescriptor; import org.hibernate.engine.query.OrdinalParameterDescriptor;
import org.hibernate.hql.QueryExecutionRequestException; import org.hibernate.hql.QueryExecutionRequestException;
import org.hibernate.impl.AbstractQueryImpl; import org.hibernate.internal.AbstractQueryImpl;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
/** /**
@ -235,12 +235,12 @@ public class QueryImpl<X> extends org.hibernate.ejb.AbstractQueryImpl<X> impleme
@Override @Override
protected boolean canApplyLockModes() { protected boolean canApplyLockModes() {
return org.hibernate.impl.QueryImpl.class.isInstance( query ); return org.hibernate.internal.QueryImpl.class.isInstance( query );
} }
@Override @Override
protected void applyAliasSpecificLockMode(String alias, LockMode lockMode) { protected void applyAliasSpecificLockMode(String alias, LockMode lockMode) {
( (org.hibernate.impl.QueryImpl) query ).getLockOptions().setAliasSpecificLockMode( alias, lockMode ); ( (org.hibernate.internal.QueryImpl) query ).getLockOptions().setAliasSpecificLockMode( alias, lockMode );
} }
/** /**
@ -624,7 +624,7 @@ public class QueryImpl<X> extends org.hibernate.ejb.AbstractQueryImpl<X> impleme
throw new IllegalStateException( "Not a JPAQL/Criteria query" ); throw new IllegalStateException( "Not a JPAQL/Criteria query" );
} }
this.jpaLockMode = lockModeType; this.jpaLockMode = lockModeType;
( (org.hibernate.impl.QueryImpl) query ).getLockOptions().setLockMode( ( (org.hibernate.internal.QueryImpl) query ).getLockOptions().setLockMode(
LockModeTypeHelper.getLockMode( lockModeType ) LockModeTypeHelper.getLockMode( lockModeType )
); );
return this; return this;

2
hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java
View File

@ -40,7 +40,7 @@ import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest;
import org.hibernate.ejb.metamodel.Phone; import org.hibernate.ejb.metamodel.Phone;
import org.hibernate.ejb.metamodel.Product; import org.hibernate.ejb.metamodel.Product;
import org.hibernate.ejb.metamodel.Product_; import org.hibernate.ejb.metamodel.Product_;
import org.hibernate.impl.AbstractQueryImpl; import org.hibernate.internal.AbstractQueryImpl;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;

2
hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SharedCacheModesTest.java
View File

@ -34,7 +34,7 @@ import org.hibernate.ejb.AvailableSettings;
import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.HibernateEntityManager;
import org.hibernate.ejb.HibernateQuery; import org.hibernate.ejb.HibernateQuery;
import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.impl.AbstractQueryImpl; import org.hibernate.internal.AbstractQueryImpl;
import org.junit.Test; import org.junit.Test;

4
hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/QueryLockingTest.java
View File

@ -31,7 +31,7 @@ import org.hibernate.LockMode;
import org.hibernate.ejb.AvailableSettings; import org.hibernate.ejb.AvailableSettings;
import org.hibernate.ejb.QueryImpl; import org.hibernate.ejb.QueryImpl;
import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.impl.SessionImpl; import org.hibernate.internal.SessionImpl;
import org.junit.Test; import org.junit.Test;
@ -62,7 +62,7 @@ public class QueryLockingTest extends BaseEntityManagerFunctionalTestCase {
em.getTransaction().begin(); em.getTransaction().begin();
QueryImpl jpaQuery = em.createQuery( "from Lockable l" ).unwrap( QueryImpl.class ); QueryImpl jpaQuery = em.createQuery( "from Lockable l" ).unwrap( QueryImpl.class );
org.hibernate.impl.QueryImpl hqlQuery = (org.hibernate.impl.QueryImpl) jpaQuery.getHibernateQuery(); org.hibernate.internal.QueryImpl hqlQuery = (org.hibernate.internal.QueryImpl) jpaQuery.getHibernateQuery();
assertEquals( LockMode.NONE, hqlQuery.getLockOptions().getLockMode() ); assertEquals( LockMode.NONE, hqlQuery.getLockOptions().getLockMode() );
assertNull( hqlQuery.getLockOptions().getAliasSpecificLockMode( "l" ) ); assertNull( hqlQuery.getLockOptions().getAliasSpecificLockMode( "l" ) );
assertEquals( LockMode.NONE, hqlQuery.getLockOptions().getEffectiveLockMode( "l" ) ); assertEquals( LockMode.NONE, hqlQuery.getLockOptions().getEffectiveLockMode( "l" ) );

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

@ -49,8 +49,7 @@ import org.hibernate.engine.SessionImplementor;
import org.hibernate.engine.jdbc.spi.JdbcConnectionAccess; import org.hibernate.engine.jdbc.spi.JdbcConnectionAccess;
import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; import org.hibernate.engine.query.sql.NativeSQLQuerySpecification;
import org.hibernate.engine.transaction.spi.TransactionCoordinator; import org.hibernate.engine.transaction.spi.TransactionCoordinator;
import org.hibernate.event.EventListeners; import org.hibernate.internal.CriteriaImpl;
import org.hibernate.impl.CriteriaImpl;
import org.hibernate.loader.custom.CustomQuery; import org.hibernate.loader.custom.CustomQuery;
import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.type.Type; import org.hibernate.type.Type;