July 2009 - hibernate-commits - Jboss List Archives

Hibernate SVN: r17031 - beanvalidation/tags.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2009-07-08 04:33:25 -0400 (Wed, 08 Jul 2009) New Revision: 17031 Removed: beanvalidation/tags/v1_0_CR3/ Log: Removed beanvalidation/tags/v1_0_CR3 - need to do some pom changes first.

14 years, 10 months

1
0
0 / 0

Hibernate SVN: r17030 - beanvalidation/tags.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2009-07-07 16:35:29 -0400 (Tue, 07 Jul 2009) New Revision: 17030 Added: beanvalidation/tags/v1_0_CR3/ Log: release 1.0 CR3 aligned with PFD2 Copied: beanvalidation/tags/v1_0_CR3 (from rev 17029, beanvalidation/trunk)

14 years, 10 months

1
0
0 / 0

Hibernate SVN: r17029 - beanvalidation/trunk/validation-api.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2009-07-07 16:33:51 -0400 (Tue, 07 Jul 2009) New Revision: 17029 Modified: beanvalidation/trunk/validation-api/pom.xml Log: release 1.0 CR3 aligned with PFD2 Modified: beanvalidation/trunk/validation-api/pom.xml =================================================================== --- beanvalidation/trunk/validation-api/pom.xml 2009-07-07 20:23:05 UTC (rev 17028) +++ beanvalidation/trunk/validation-api/pom.xml 2009-07-07 20:33:51 UTC (rev 17029) @@ -6,7 +6,7 @@ <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.CR3-SNAPSHOT</version> + <version>1.0.CR3</version> <packaging>jar</packaging> <name>Bean Validation API</name>

14 years, 10 months

1
0
0 / 0

Hibernate SVN: r17028 - in beanvalidation/trunk/validation-api/src/main/java/javax/validation: metadata and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2009-07-07 16:23:05 -0400 (Tue, 07 Jul 2009) New Revision: 17028 Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintValidatorContext.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/TraversableResolver.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/Validator.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ElementDescriptor.java Log: Fix Javadoc typos and style Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintValidatorContext.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintValidatorContext.java 2009-07-07 18:39:39 UTC (rev 17027) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/ConstraintValidatorContext.java 2009-07-07 20:23:05 UTC (rev 17028) @@ -50,8 +50,9 @@ * ErrorBuilder or any of its associated nested interfaces * an IllegalStateException is raised. * - * If <code>isValid<code> returns <code>false</code>, a <code>ConstraintViolation</code> object will be built - * per error including the default one unless {@link #disableDefaultError()} has been called. + * If <code>isValid<code> returns <code>false</code>, a <code>ConstraintViolation</code> + * object will be built per error including the default one unless + * {@link #disableDefaultError()} has been called. * * <code>ConstraintViolation</code> objects generated from such a call * contain the same contextual information (root bean, path and so on) unless @@ -67,12 +68,14 @@ * context.buildErrorWithMessageTemplate( "way too long" ) * .addError(); * - * // create new error in the "street" subnode of the default path the constraint is located on + * // create new error in the "street" subnode of the default path the constraint + * // is located on * context.buildErrorWithMessageTemplate( "way too long" ) * .addSubNode( "street" ) * .addError(); * - * //create new error in the "addresses["home"].city.name subnode of the default path the constraint is located on + * //create new error in the "addresses["home"].city.name subnode of the default + * // path the constraint is located on * context.buildErrorWithMessageTemplate( "this detail is wrong" ) * .addSubNode( "addresses" ) * .addSubNode( "country" ) Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/TraversableResolver.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/TraversableResolver.java 2009-07-07 18:39:39 UTC (rev 17027) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/TraversableResolver.java 2009-07-07 20:23:05 UTC (rev 17028) @@ -32,7 +32,8 @@ /** * Determine if Bean Validation is allowed to reach the property state * - * @param traversableObject object hosting <code>traversableProperty</code>, null if validateValue is called + * @param traversableObject object hosting <code>traversableProperty</code> or null + * if validateValue is called * @param traversableProperty the traversable property. * @param rootBeanType type of the root object passed to the Validator. * @param pathToTraversableObject path from the root object to @@ -56,7 +57,8 @@ * Note that this method is called only if isReachable returns true for the same set of * arguments and if the property is marked as <code>@Valid</code> * - * @param traversableObject object hosting <code>traversableProperty</code>, null if validateValue is called + * @param traversableObject object hosting <code>traversableProperty</code> or null + * if validateValue is called * @param traversableProperty the traversable property. * @param rootBeanType type of the root object passed to the Validator. * @param pathToTraversableObject path from the root object to Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/Validator.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/Validator.java 2009-07-07 18:39:39 UTC (rev 17027) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/Validator.java 2009-07-07 20:23:05 UTC (rev 17028) @@ -44,7 +44,7 @@ <T> Set<ConstraintViolation<T>> validate(T object, Class<?>... groups); /** - * Validates all constraints placed on the property named <code>propertyName</code> + * Validates all constraints placed on the property named <code>propertyName</code> * of <code>object</code> * * @param object object to validate Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ElementDescriptor.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ElementDescriptor.java 2009-07-07 18:39:39 UTC (rev 17027) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/metadata/ElementDescriptor.java 2009-07-07 20:23:05 UTC (rev 17028) @@ -28,7 +28,8 @@ public interface ElementDescriptor { /** - * @return <code>true</code> if at least one constraint declaration is present on the element, <code>false</code> otherwise. + * @return <code>true</code> if at least one constraint declaration is + * present on the element, <code>false</code> otherwise. */ boolean hasConstraints();

14 years, 10 months

1
0
0 / 0

Hibernate SVN: r17027 - in core/trunk: cache-jbosscache/src/main/java/org/hibernate/cache/jbc and 6 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-07-07 14:39:39 -0400 (Tue, 07 Jul 2009) New Revision: 17027 Added: core/trunk/core/src/main/java/org/hibernate/Cache.java Modified: core/trunk/annotations/pom.xml core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/BasicRegionAdapter.java core/trunk/core/src/main/java/org/hibernate/SessionFactory.java core/trunk/core/src/main/java/org/hibernate/StatelessSession.java core/trunk/core/src/main/java/org/hibernate/cache/Region.java core/trunk/core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java core/trunk/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java Log: HHH-4022 - Add an actual API contract for querying/managing cache regions (from app code) Modified: core/trunk/annotations/pom.xml =================================================================== --- core/trunk/annotations/pom.xml 2009-07-07 18:33:23 UTC (rev 17026) +++ core/trunk/annotations/pom.xml 2009-07-07 18:39:39 UTC (rev 17027) @@ -62,7 +62,7 @@ <dependency> <groupId>org.hibernate.java-persistence</groupId> <artifactId>jpa-api</artifactId> - <version>2.0.Beta1</version> + <version>2.0.pfd-SNAPSHOT</version> </dependency> <dependency> <groupId>javassist</groupId> Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/BasicRegionAdapter.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/BasicRegionAdapter.java 2009-07-07 18:33:23 UTC (rev 17026) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/BasicRegionAdapter.java 2009-07-07 18:39:39 UTC (rev 17027) @@ -342,6 +342,25 @@ } } + public boolean contains(Object key) { + if ( !checkValid() ) { + return false; + } + + try { + Option opt = new Option(); + opt.setLockAcquisitionTimeout(100); + CacheHelper.setInvocationOption( jbcCache, opt ); + return CacheHelper.getAllowingTimeout( jbcCache, regionFqn, key ) != null; + } + catch ( CacheException ce ) { + throw ce; + } + catch ( Throwable t ) { + throw new CacheException( t ); + } + } + public long getSizeInMemory() { // not supported return -1; @@ -356,7 +375,11 @@ size--; } return size; - } catch (Exception e) { + } + catch ( CacheException ce ) { + throw ce; + } + catch (Exception e) { throw new CacheException(e); } } Added: core/trunk/core/src/main/java/org/hibernate/Cache.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/Cache.java (rev 0) +++ core/trunk/core/src/main/java/org/hibernate/Cache.java 2009-07-07 18:39:39 UTC (rev 17027) @@ -0,0 +1,165 @@ +/* + * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate; + +import java.io.Serializable; + +/** + * Provides an API for querying/managing the second level cache regions. + * + * CAUTION: None of these methods respect any isolation or transactional + * semantics associated with the underlying caches. Specifically, evictions + * perform an immediate "hard" removal outside any transactions and/or locking + * scheme(s). + * + * @author Steve Ebersole + */ +public interface Cache { + /** + * Determine whether the cache contains data for the given entity "instance". + * + * The semantic here is whether the cache contains data visible for the + * current call context. + * + * @param entityClass The entity class. + * @param identifier The entity identifier + * + * @return True if the underlying cache contains corresponding data; false + * otherwise. + */ + public boolean containsEntity(Class entityClass, Serializable identifier); + + /** + * Determine whether the cache contains data for the given entity "instance". + * + * The semantic here is whether the cache contains data visible for the + * current call context. + * + * @param entityName The entity name. + * @param identifier The entity identifier + * + * @return True if the underlying cache contains corresponding data; false otherwise. + */ + public boolean containsEntity(String entityName, Serializable identifier); + + /** + * Evicts the entity data for a particular entity "instance". + * + * @param entityClass The entity class. + * @param identifier The entity identifier + */ + public void evictEntity(Class entityClass, Serializable identifier); + + /** + * Evicts the entity data for a particular entity "instance". + * + * @param entityName The entity name. + * @param identifier The entity identifier + */ + public void evictEntity(String entityName, Serializable identifier); + + /** + * Evicts all entity data from the given region (i.e. for all entities of + * type). + * + * @param entityClass The entity class. + */ + public void evictEntityRegion(Class entityClass); + + /** + * Evicts all entity data from the given region (i.e. for all entities of + * type). + * + * @param entityName The entity name. + */ + public void evictEntityRegion(String entityName); + + /** + * Evict data from all entity regions. + */ + public void evictEntityRegions(); + + /** + * Determine whether the cache contains data for the given collection. + * + * The semantic here is whether the cache contains data visible for the + * current call context. + * + * @param role The name of the collection role (in form + * [owner-entity-name].[collection-property-name]) whose regions should be + * evicted. + * @param ownerIdentifier The identifier of the owning entity + * + * @return True if the underlying cache contains corresponding data; false otherwise. + */ + public boolean containsCollection(String role, Serializable ownerIdentifier); + + /** + * Evicts the cache data for the given identified collection instance. + * + * @param role The "collection role" (in form [owner-entity-name].[collection-property-name]). + * @param ownerIdentifier The identifier of the owning entity + */ + public void evictCollection(String role, Serializable ownerIdentifier); + + /** + * Evicts all entity data from the given region (i.e. evicts cached data + * for all of the specified c9ollection role). + * + * @param role The "collection role" (in form [owner-entity-name].[collection-property-name]). + */ + public void evictCollectionRegion(String role); + + /** + * Evict data from all collection regions. + */ + public void evictCollectionRegions(); + + /** + * Determine whether the cache contains data for the given query. + * + * The semantic here is whether the cache contains any data for the given + * region name since query result caches are not transactionally isolated. + * + * @param regionName The cache name given to the query. + * + * @return True if the underlying cache contains corresponding data; false otherwise. + */ + public boolean containsQuery(String regionName); + + /** + * Evicts all cached query results from the default region. + */ + public void evictDefaultQueryRegion(); + + /** + * Evicts all cached query results under the given name. + * + * @param regionName The cache name associated to the queries being cached. + */ + public void evictQueryRegion(String regionName); + + /** + * Evict data from all query regions. + */ + public void evictQueryRegions(); +} Modified: core/trunk/core/src/main/java/org/hibernate/SessionFactory.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/SessionFactory.java 2009-07-07 18:33:23 UTC (rev 17026) +++ core/trunk/core/src/main/java/org/hibernate/SessionFactory.java 2009-07-07 18:39:39 UTC (rev 17027) @@ -37,68 +37,81 @@ import org.hibernate.engine.FilterDefinition; /** - * Creates <tt>Session</tt>s. Usually an application has a single <tt>SessionFactory</tt>. - * Threads servicing client requests obtain <tt>Session</tt>s from the factory. - * - * Implementors must be threadsafe. - * - * <tt>SessionFactory</tt>s are immutable. The behaviour of a <tt>SessionFactory</tt> is - * controlled by properties supplied at configuration time. These properties are defined - * on <tt>Environment</tt>. + * The main contract here is the creation of {@link Session} instances. Usually + * an application has a single {@link SessionFactory} instance and threads + * servicing client requests obtain {@link Session} instances from this factory. + * + * The internal state of a {@link SessionFactory} is immutable. Once it is created + * this internal state is set. This internal state includes all of the metadata + * about Object/Relational Mapping. + * + * Implementors must be threadsafe. * - * @see Session - * @see org.hibernate.cfg.Environment * @see org.hibernate.cfg.Configuration - * @see org.hibernate.connection.ConnectionProvider - * @see org.hibernate.transaction.TransactionFactory + * * @author Gavin King + * @author Steve Ebersole */ public interface SessionFactory extends Referenceable, Serializable { - /** - * Open a <tt>Session</tt> on the given connection. - * - * Note that the second-level cache will be disabled if you - * supply a JDBC connection. Hibernate will not be able to track - * any statements you might have executed in the same transaction. - * Consider implementing your own <tt>ConnectionProvider</tt>. + * Open a {@link Session}. + * + * JDBC {@link Connection connection(s} will be obtained from the + * configured {@link org.hibernate.connection.ConnectionProvider} as needed + * to perform requested work. * - * @param connection a connection provided by the application. - * @return Session + * @return The created session. + * + * @throws HibernateException Indicates a peroblem opening the session; pretty rare here. */ - public org.hibernate.classic.Session openSession(Connection connection); + public org.hibernate.classic.Session openSession() throws HibernateException; /** - * Create database connection and open a <tt>Session</tt> on it, specifying an - * interceptor. + * Open a {@link Session}, utilizing the specified {@link Interceptor}. + * + * JDBC {@link Connection connection(s} will be obtained from the + * configured {@link org.hibernate.connection.ConnectionProvider} as needed + * to perform requested work. * * @param interceptor a session-scoped interceptor - * @return Session - * @throws HibernateException + * + * @return The created session. + * + * @throws HibernateException Indicates a peroblem opening the session; pretty rare here. */ public org.hibernate.classic.Session openSession(Interceptor interceptor) throws HibernateException; /** - * Open a <tt>Session</tt> on the given connection, specifying an interceptor. + * Open a {@link Session}, utilizing the specfied JDBC {@link Connection}. * - * Note that the second-level cache will be disabled if you - * supply a JDBC connection. Hibernate will not be able to track - * any statements you might have executed in the same transaction. - * Consider implementing your own <tt>ConnectionProvider</tt>. + * Note that the second-level cache will be disabled if you supply a JDBC + * connection. Hibernate will not be able to track any statements you might + * have executed in the same transaction. Consider implementing your own + * {@link org.hibernate.connection.ConnectionProvider} instead as a highly + * recommended alternative. * * @param connection a connection provided by the application. - * @param interceptor a session-scoped interceptor - * @return Session + * + * @return The created session. */ - public org.hibernate.classic.Session openSession(Connection connection, Interceptor interceptor); + public org.hibernate.classic.Session openSession(Connection connection); /** - * Create database connection and open a <tt>Session</tt> on it. + * Open a {@link Session}, utilizing the specfied JDBC {@link Connection} and + * specified {@link Interceptor}. + * + * Note that the second-level cache will be disabled if you supply a JDBC + * connection. Hibernate will not be able to track any statements you might + * have executed in the same transaction. Consider implementing your own + * {@link org.hibernate.connection.ConnectionProvider} instead as a highly + * recommended alternative. * - * @return Session - * @throws HibernateException + * @param connection a connection provided by the application. + * @param interceptor a session-scoped interceptor + * + * @return The created session. */ - public org.hibernate.classic.Session openSession() throws HibernateException; + public org.hibernate.classic.Session openSession(Connection connection, Interceptor interceptor); /** * Obtains the current session. The definition of what exactly "current" @@ -111,123 +124,243 @@ * impl. * * @return The current session. + * * @throws HibernateException Indicates an issue locating a suitable current session. */ public org.hibernate.classic.Session getCurrentSession() throws HibernateException; /** - * Get the <tt>ClassMetadata</tt> associated with the given entity class + * Open a new stateless session. * - * @see org.hibernate.metadata.ClassMetadata + * @return The created stateless session. */ - public ClassMetadata getClassMetadata(Class persistentClass) throws HibernateException; + public StatelessSession openStatelessSession(); /** - * Get the <tt>ClassMetadata</tt> associated with the given entity name + * Open a new stateless session, utilizing the specified JDBC + * {@link Connection}. * - * @see org.hibernate.metadata.ClassMetadata - * @since 3.0 + * @param connection Connection provided by the application. + * + * @return The created stateless session. */ - public ClassMetadata getClassMetadata(String entityName) throws HibernateException; + public StatelessSession openStatelessSession(Connection connection); /** - * Get the <tt>CollectionMetadata</tt> associated with the named collection role + * Retrieve the {@link ClassMetadata} associated with the given entity class. * - * @see org.hibernate.metadata.CollectionMetadata + * @param entityClass The entity class + * + * @return The metadata associated with the given entity; may be null if no such + * entity was mapped. + * + * @throws HibernateException Generally null is returned instead of throwing. */ - public CollectionMetadata getCollectionMetadata(String roleName) throws HibernateException; + public ClassMetadata getClassMetadata(Class entityClass); + /** + * Retrieve the {@link ClassMetadata} associated with the given entity class. + * + * @param entityName The entity class + * + * @return The metadata associated with the given entity; may be null if no such + * entity was mapped. + * + * @throws HibernateException Generally null is returned instead of throwing. + * @since 3.0 + */ + public ClassMetadata getClassMetadata(String entityName); /** - * Get all <tt>ClassMetadata</tt> as a <tt>Map</tt> from entityname <tt>String</tt> - * to metadata object + * Get the {@link CollectionMetadata} associated with the named collection role. * - * @see org.hibernate.metadata.ClassMetadata - * @return a map from <tt>String</tt> an entity name to <tt>ClassMetaData</tt> - * @since 3.0 changed key from <tt>Class</tt> to <tt>String</tt> + * @param roleName The collection role (in form [owning-entity-name].[collection-property-name]). + * + * @return The metadata associated with the given collection; may be null if no such + * collection was mapped. + * + * @throws HibernateException Generally null is returned instead of throwing. */ - public Map getAllClassMetadata() throws HibernateException; + public CollectionMetadata getCollectionMetadata(String roleName); /** - * Get all <tt>CollectionMetadata</tt> as a <tt>Map</tt> from role name - * to metadata object + * Retrieve the {@link ClassMetadata} for all mapped entities. * - * @see org.hibernate.metadata.CollectionMetadata + * @return A map containing all {@link ClassMetadata} keyed by the + * corresponding {@link String} entity-name. + * + * @throws HibernateException Generally empty map is returned instead of throwing. + * + * @since 3.0 changed key from {@link Class} to {@link String}. + */ + public Map getAllClassMetadata(); + + /** + * Get the {@link CollectionMetadata} for all mapped collections + * * @return a map from <tt>String</tt> to <tt>CollectionMetadata</tt> + * + * @throws HibernateException Generally empty map is returned instead of throwing. */ - public Map getAllCollectionMetadata() throws HibernateException; + public Map getAllCollectionMetadata(); /** - * Get the statistics for this session factory + * Retrieve the statistics fopr this factory. + * + * @return The statistics. */ public Statistics getStatistics(); /** * Destroy this <tt>SessionFactory</tt> and release all resources (caches, - * connection pools, etc). It is the responsibility of the application - * to ensure that there are no open <tt>Session</tt>s before calling - * <tt>close()</tt>. + * connection pools, etc). + * + * It is the responsibility of the application to ensure that there are no + * open {@link Session sessions} before calling this method as the impact + * on those {@link Session sessions} is indeterminate. + * + * No-ops if already {@link #isClosed closed}. + * + * @throws HibernateException Indicates an issue closing the factory. */ public void close() throws HibernateException; /** - * Was this <tt>SessionFactory</tt> already closed? + * Is this factory already closed? + * + * @return True if this factory is already closed; false otherwise. */ public boolean isClosed(); /** + * Obtain direct access to the underlying cache regions. + * + * @return The direct cache access API. + */ + public Cache getCache(); + + /** * Evict all entries from the second-level cache. This method occurs outside * of any transaction; it performs an immediate "hard" remove, so does not respect * any transaction isolation semantics of the usage strategy. Use with care. + * + * @param persistentClass The entity class for which to evict data. + * + * @throws HibernateException Generally will mean that either that + * 'persisttentClass' did not name a mapped entity or a problem + * communicating with underlying cache impl. + * + * @deprecated Use {@link Cache#evictEntityRegion(Class)} accessed through + * {@link #getCache()} instead. */ public void evict(Class persistentClass) throws HibernateException; + /** * Evict an entry from the second-level cache. This method occurs outside * of any transaction; it performs an immediate "hard" remove, so does not respect * any transaction isolation semantics of the usage strategy. Use with care. + * + * @param persistentClass The entity class for which to evict data. + * @param id The entity id + * + * @throws HibernateException Generally will mean that either that + * 'persisttentClass' did not name a mapped entity or a problem + * communicating with underlying cache impl. + * + * @deprecated Use {@link Cache#containsEntity(Class, Serializable)} accessed through + * {@link #getCache()} instead. */ public void evict(Class persistentClass, Serializable id) throws HibernateException; + /** * Evict all entries from the second-level cache. This method occurs outside * of any transaction; it performs an immediate "hard" remove, so does not respect * any transaction isolation semantics of the usage strategy. Use with care. + * + * @param entityName The entity name for which to evict data. + * + * @throws HibernateException Generally will mean that either that + * 'persisttentClass' did not name a mapped entity or a problem + * communicating with underlying cache impl. + * + * @deprecated Use {@link Cache#evictEntityRegion(String)} accessed through + * {@link #getCache()} instead. */ public void evictEntity(String entityName) throws HibernateException; + /** * Evict an entry from the second-level cache. This method occurs outside * of any transaction; it performs an immediate "hard" remove, so does not respect * any transaction isolation semantics of the usage strategy. Use with care. + * + * @param entityName The entity name for which to evict data. + * @param id The entity id + * + * @throws HibernateException Generally will mean that either that + * 'persisttentClass' did not name a mapped entity or a problem + * communicating with underlying cache impl. + * + * @deprecated Use {@link Cache#evictEntity(String,Serializable)} accessed through + * {@link #getCache()} instead. */ public void evictEntity(String entityName, Serializable id) throws HibernateException; + /** * Evict all entries from the second-level cache. This method occurs outside * of any transaction; it performs an immediate "hard" remove, so does not respect * any transaction isolation semantics of the usage strategy. Use with care. + * + * @param roleName The name of the collection role whose regions should be evicted + * + * @throws HibernateException Generally will mean that either that + * 'roleName' did not name a mapped collection or a problem + * communicating with underlying cache impl. + * + * @deprecated Use {@link Cache#evictCollectionRegion(String)} accessed through + * {@link #getCache()} instead. */ public void evictCollection(String roleName) throws HibernateException; + /** * Evict an entry from the second-level cache. This method occurs outside * of any transaction; it performs an immediate "hard" remove, so does not respect * any transaction isolation semantics of the usage strategy. Use with care. + * + * @param roleName The name of the collection role + * @param id The id of the collection owner + * + * @throws HibernateException Generally will mean that either that + * 'roleName' did not name a mapped collection or a problem + * communicating with underlying cache impl. + * + * @deprecated Use {@link Cache#evictCollection(String,Serializable)} accessed through + * {@link #getCache()} instead. */ public void evictCollection(String roleName, Serializable id) throws HibernateException; /** - * Evict any query result sets cached in the default query cache region. - */ - public void evictQueries() throws HibernateException; - /** * Evict any query result sets cached in the named query cache region. + * + * @param cacheRegion The named query cache region from which to evict. + * + * @throws HibernateException Since a not-found 'cacheRegion' simply no-ops, + * this should indicate a problem communicating with underlying cache impl. + * + * @deprecated Use {@link Cache#evictQueryRegion(String)} accessed through + * {@link #getCache()} instead. */ public void evictQueries(String cacheRegion) throws HibernateException; + /** - * Get a new stateless session. + * Evict any query result sets cached in the default query cache region. + * + * @throws HibernateException Indicate a problem communicating with + * underlying cache impl. + * + * @deprecated Use {@link Cache#evictQueryRegions} accessed through + * {@link #getCache()} instead. */ - public StatelessSession openStatelessSession(); - /** - * Get a new stateless session for the given JDBC connection. - */ - public StatelessSession openStatelessSession(Connection connection); + public void evictQueries() throws HibernateException; /** * Obtain a set of the names of all filters defined on this SessionFactory. Modified: core/trunk/core/src/main/java/org/hibernate/StatelessSession.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/StatelessSession.java 2009-07-07 18:33:23 UTC (rev 17026) +++ core/trunk/core/src/main/java/org/hibernate/StatelessSession.java 2009-07-07 18:39:39 UTC (rev 17027) @@ -28,20 +28,18 @@ import java.sql.Connection; /** - * A command-oriented API for performing bulk operations - * against a database. - * - * A stateless session does not implement a first-level cache nor - * interact with any second-level cache, nor does it implement - * transactional write-behind or automatic dirty checking, nor do - * operations cascade to associated instances. Collections are - * ignored by a stateless session. Operations performed via a - * stateless session bypass Hibernate's event model and - * interceptors. Stateless sessions are vulnerable to data - * aliasing effects, due to the lack of a first-level cache. - * - * For certain kinds of transactions, a stateless session may - * perform slightly faster than a stateful session. + * A command-oriented API for performing bulk operations against a database. + * + * A stateless session does not implement a first-level cache nor interact + * with any second-level cache, nor does it implement transactional + * write-behind or automatic dirty checking, nor do operations cascade to + * associated instances. Collections are ignored by a stateless session. + * Operations performed via a stateless session bypass Hibernate's event model + * and interceptors. Stateless sessions are vulnerable to data aliasing + * effects, due to the lack of a first-level cache. + * + * For certain kinds of transactions, a stateless session may perform slightly + * faster than a stateful session. * * @author Gavin King */ Modified: core/trunk/core/src/main/java/org/hibernate/cache/Region.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cache/Region.java 2009-07-07 18:33:23 UTC (rev 17026) +++ core/trunk/core/src/main/java/org/hibernate/cache/Region.java 2009-07-07 18:39:39 UTC (rev 17027) @@ -50,6 +50,20 @@ public void destroy() throws CacheException; /** + * Determine whether this region contains data for the given key. + * + * The semantic here is whether the cache contains data visible for the + * current call context. This should be viewed as a "best effort", meaning + * blocking should be avoid if possible. + * + * @param key The cache key + * + * @return True if the underlying cache contains corresponding data; false + * otherwise. + */ + public boolean contains(Object key); + + /** * The number of bytes is this cache region currently consuming in memory. * * @return The number of bytes consumed by this region; -1 if unknown or Modified: core/trunk/core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java 2009-07-07 18:33:23 UTC (rev 17026) +++ core/trunk/core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java 2009-07-07 18:39:39 UTC (rev 17027) @@ -57,6 +57,11 @@ underlyingCache.destroy(); } + public boolean contains(Object key) { + // safer to utilize the toMap() as oposed to say get(key) != null + return underlyingCache.toMap().containsKey( key ); + } + public long getSizeInMemory() { return underlyingCache.getSizeInMemory(); } Modified: core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java 2009-07-07 18:33:23 UTC (rev 17026) +++ core/trunk/core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java 2009-07-07 18:39:39 UTC (rev 17027) @@ -60,6 +60,7 @@ import org.hibernate.StatelessSession; import org.hibernate.SessionFactoryObserver; import org.hibernate.EntityNameResolver; +import org.hibernate.Cache; import org.hibernate.tuple.entity.EntityTuplizer; import org.hibernate.cache.CacheKey; import org.hibernate.cache.CollectionRegion; @@ -877,6 +878,15 @@ return collectionMetadata; } + public Type getReferencedPropertyType(String className, String propertyName) + throws MappingException { + return getEntityPersister(className).getPropertyType(propertyName); + } + + public ConnectionProvider getConnectionProvider() { + return settings.getConnectionProvider(); + } + /** * Closes the session factory, releasing all held resources. * @@ -946,78 +956,185 @@ eventListeners.destroyListeners(); } - public void evictEntity(String entityName, Serializable id) throws HibernateException { - EntityPersister p = getEntityPersister( entityName ); - if ( p.hasCache() ) { - if ( log.isDebugEnabled() ) { - log.debug( "evicting second-level cache: " + MessageHelper.infoString(p, id, this) ); + private final Cache cacheAccess = new CacheImpl(); + + private class CacheImpl implements Cache { + public boolean containsEntity(Class entityClass, Serializable identifier) { + return containsEntity( entityClass.getName(), identifier ); + } + + public boolean containsEntity(String entityName, Serializable identifier) { + // todo : need a contains() method on the underlying regions + throw new UnsupportedOperationException( "not yet implemented - HHH-4021" ); + } + + public void evictEntity(Class entityClass, Serializable identifier) { + evictEntity( entityClass.getName(), identifier ); + } + + public void evictEntity(String entityName, Serializable identifier) { + EntityPersister p = getEntityPersister( entityName ); + if ( p.hasCache() ) { + if ( log.isDebugEnabled() ) { + log.debug( + "evicting second-level cache: " + + MessageHelper.infoString( p, identifier, SessionFactoryImpl.this ) + ); + } + CacheKey cacheKey = new CacheKey( + identifier, + p.getIdentifierType(), + p.getRootEntityName(), + EntityMode.POJO, + SessionFactoryImpl.this + ); + p.getCacheAccessStrategy().evict( cacheKey ); } - CacheKey cacheKey = new CacheKey( id, p.getIdentifierType(), p.getRootEntityName(), EntityMode.POJO, this ); - p.getCacheAccessStrategy().evict( cacheKey ); } - } - public void evictEntity(String entityName) throws HibernateException { - EntityPersister p = getEntityPersister( entityName ); - if ( p.hasCache() ) { - if ( log.isDebugEnabled() ) { - log.debug( "evicting second-level cache: " + p.getEntityName() ); + public void evictEntityRegion(Class entityClass) { + evictEntityRegion( entityClass.getName() ); + } + + public void evictEntityRegion(String entityName) { + EntityPersister p = getEntityPersister( entityName ); + if ( p.hasCache() ) { + if ( log.isDebugEnabled() ) { + log.debug( "evicting second-level cache: " + p.getEntityName() ); + } + p.getCacheAccessStrategy().evictAll(); } - p.getCacheAccessStrategy().evictAll(); } - } - public void evict(Class persistentClass, Serializable id) throws HibernateException { - EntityPersister p = getEntityPersister( persistentClass.getName() ); - if ( p.hasCache() ) { - if ( log.isDebugEnabled() ) { - log.debug( "evicting second-level cache: " + MessageHelper.infoString(p, id, this) ); + public void evictEntityRegions() { + Iterator entityNames = entityPersisters.keySet().iterator(); + while ( entityNames.hasNext() ) { + evictEntityRegion( ( String ) entityNames.next() ); } - CacheKey cacheKey = new CacheKey( id, p.getIdentifierType(), p.getRootEntityName(), EntityMode.POJO, this ); - p.getCacheAccessStrategy().evict( cacheKey ); } - } - public void evict(Class persistentClass) throws HibernateException { - EntityPersister p = getEntityPersister( persistentClass.getName() ); - if ( p.hasCache() ) { - if ( log.isDebugEnabled() ) { - log.debug( "evicting second-level cache: " + p.getEntityName() ); + public boolean containsCollection(String role, Serializable ownerIdentifier) { + // todo : need a contains() method on the underlying regions + return false; + } + + public void evictCollection(String role, Serializable ownerIdentifier) { + CollectionPersister p = getCollectionPersister( role ); + if ( p.hasCache() ) { + if ( log.isDebugEnabled() ) { + log.debug( + "evicting second-level cache: " + + MessageHelper.collectionInfoString(p, ownerIdentifier, SessionFactoryImpl.this) + ); + } + CacheKey cacheKey = new CacheKey( + ownerIdentifier, + p.getKeyType(), + p.getRole(), + EntityMode.POJO, + SessionFactoryImpl.this + ); + p.getCacheAccessStrategy().evict( cacheKey ); } - p.getCacheAccessStrategy().evictAll(); } - } - public void evictCollection(String roleName, Serializable id) throws HibernateException { - CollectionPersister p = getCollectionPersister( roleName ); - if ( p.hasCache() ) { - if ( log.isDebugEnabled() ) { - log.debug( "evicting second-level cache: " + MessageHelper.collectionInfoString(p, id, this) ); + public void evictCollectionRegion(String role) { + CollectionPersister p = getCollectionPersister( role ); + if ( p.hasCache() ) { + if ( log.isDebugEnabled() ) { + log.debug( "evicting second-level cache: " + p.getRole() ); + } + p.getCacheAccessStrategy().evictAll(); } - CacheKey cacheKey = new CacheKey( id, p.getKeyType(), p.getRole(), EntityMode.POJO, this ); - p.getCacheAccessStrategy().evict( cacheKey ); } - } - public void evictCollection(String roleName) throws HibernateException { - CollectionPersister p = getCollectionPersister( roleName ); - if ( p.hasCache() ) { - if ( log.isDebugEnabled() ) { - log.debug( "evicting second-level cache: " + p.getRole() ); + public void evictCollectionRegions() { + Iterator collectionRoles = collectionPersisters.keySet().iterator(); + while ( collectionRoles.hasNext() ) { + evictCollectionRegion( ( String ) collectionRoles.next() ); } - p.getCacheAccessStrategy().evictAll(); } + + public boolean containsQuery(String regionName) { + // todo : need a contains() method on the underlying regions + return false; + } + + public void evictDefaultQueryRegion() { + if ( settings.isQueryCacheEnabled() ) { + queryCache.clear(); + } + } + + public void evictQueryRegion(String regionName) { + if ( regionName == null ) { + throw new NullPointerException( + "Region-name cannot be null (use Cache#evictDefaultQueryRegion to evict the default query cache)" + ); + } + else { + synchronized ( allCacheRegions ) { + if ( settings.isQueryCacheEnabled() ) { + QueryCache namedQueryCache = ( QueryCache ) queryCaches.get( regionName ); + if ( namedQueryCache != null ) { + namedQueryCache.clear(); + // TODO : cleanup entries in queryCaches + allCacheRegions ? + } + } + } + } + } + + public void evictQueryRegions() { + synchronized ( allCacheRegions ) { + Iterator regions = queryCaches.values().iterator(); + while ( regions.hasNext() ) { + QueryCache cache = ( QueryCache ) regions.next(); + cache.clear(); + // TODO : cleanup entries in queryCaches + allCacheRegions ? + } + } + } } - public Type getReferencedPropertyType(String className, String propertyName) - throws MappingException { - return getEntityPersister(className).getPropertyType(propertyName); + public Cache getCache() { + return cacheAccess; } - public ConnectionProvider getConnectionProvider() { - return settings.getConnectionProvider(); + public void evictEntity(String entityName, Serializable id) throws HibernateException { + getCache().evictEntity( entityName, id ); } + public void evictEntity(String entityName) throws HibernateException { + getCache().evictEntityRegion( entityName ); + } + + public void evict(Class persistentClass, Serializable id) throws HibernateException { + getCache().evictEntity( persistentClass, id ); + } + + public void evict(Class persistentClass) throws HibernateException { + getCache().evictEntityRegion( persistentClass ); + } + + public void evictCollection(String roleName, Serializable id) throws HibernateException { + getCache().evictCollection( roleName, id ); + } + + public void evictCollection(String roleName) throws HibernateException { + getCache().evictCollectionRegion( roleName ); + } + + public void evictQueries() throws HibernateException { + if ( settings.isQueryCacheEnabled() ) { + queryCache.clear(); + } + } + + public void evictQueries(String regionName) throws HibernateException { + getCache().evictQueryRegion( regionName ); + } + public UpdateTimestampsCache getUpdateTimestampsCache() { return updateTimestampsCache; } @@ -1070,28 +1187,6 @@ return statistics; } - public void evictQueries() throws HibernateException { - if ( settings.isQueryCacheEnabled() ) { - queryCache.clear(); - } - } - - public void evictQueries(String cacheRegion) throws HibernateException { - if (cacheRegion==null) { - throw new NullPointerException("use the zero-argument form to evict the default query cache"); - } - else { - synchronized (allCacheRegions) { - if ( settings.isQueryCacheEnabled() ) { - QueryCache currentQueryCache = (QueryCache) queryCaches.get(cacheRegion); - if ( currentQueryCache != null ) { - currentQueryCache.clear(); - } - } - } - } - } - public FilterDefinition getFilterDefinition(String filterName) throws HibernateException { FilterDefinition def = ( FilterDefinition ) filters.get( filterName ); if ( def == null ) { Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java 2009-07-07 18:33:23 UTC (rev 17026) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java 2009-07-07 18:39:39 UTC (rev 17027) @@ -90,26 +90,23 @@ this.sessionFactory = sessionFactory; } - public boolean contains(Class aClass, Object o) { - throw new UnsupportedOperationException( "not yet implemented - HHH-4021" ); + public boolean contains(Class entityClass, Object identifier) { + return sessionFactory.getCache().containsEntity( entityClass, ( Serializable ) identifier ); } - public void evict(Class entityType, Object id) { - sessionFactory.evict( entityType, ( Serializable ) id ); + public void evict(Class entityClass, Object identifier) { + sessionFactory.getCache().evictEntity( entityClass, ( Serializable ) identifier ); } - public void evict(Class entityType) { - sessionFactory.evict( entityType ); + public void evict(Class entityClass) { + sessionFactory.getCache().evictEntityRegion( entityClass ); } public void evictAll() { - for ( String entityName : (Set<String>) sessionFactory.getAllClassMetadata().entrySet() ) { - sessionFactory.evictEntity( entityName ); - } - for ( String collectionName : (Set<String>) sessionFactory.getAllCollectionMetadata().entrySet() ) { - sessionFactory.evictCollection( collectionName ); - } - sessionFactory.evictQueries(); + sessionFactory.getCache().evictEntityRegions(); +// TODO : if we want to allow an optional clearing of all cache data, the additional calls would be: +// sessionFactory.getCache().evictCollectionRegions(); +// sessionFactory.getCache().evictQueryRegions(); } } } Modified: core/trunk/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java =================================================================== --- core/trunk/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java 2009-07-07 18:33:23 UTC (rev 17026) +++ core/trunk/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java 2009-07-07 18:39:39 UTC (rev 17027) @@ -19,6 +19,7 @@ import org.hibernate.Interceptor; import org.hibernate.SessionFactory; import org.hibernate.StatelessSession; +import org.hibernate.Cache; import org.hibernate.engine.FilterDefinition; import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.UUIDHexGenerator; @@ -144,6 +145,10 @@ return false; } + public Cache getCache() { + return getImpl().getCache(); + } + public void evict(Class persistentClass, Serializable id) throws HibernateException { getImpl().evict(persistentClass, id);

14 years, 10 months

1
0
0 / 0

Hibernate SVN: r17026 - core/trunk/distribution.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-07-07 14:33:23 -0400 (Tue, 07 Jul 2009) New Revision: 17026 Modified: core/trunk/distribution/pom.xml Log: HHH-4029 - Remove cache-jbosscache2 module Modified: core/trunk/distribution/pom.xml =================================================================== --- core/trunk/distribution/pom.xml 2009-07-07 18:26:08 UTC (rev 17025) +++ core/trunk/distribution/pom.xml 2009-07-07 18:33:23 UTC (rev 17026) @@ -89,11 +89,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>hibernate-jbosscache2</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>hibernate-oscache</artifactId> <version>${project.version}</version> </dependency>

14 years, 10 months

1
0
0 / 0

Hibernate SVN: r17025 - in core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc: util and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-07-07 14:26:08 -0400 (Tue, 07 Jul 2009) New Revision: 17025 Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/BasicRegionAdapter.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CacheHelper.java Log: HHH-4028 - Move current cache-jbosscache2 module content to cache-jbosscache Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/BasicRegionAdapter.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/BasicRegionAdapter.java 2009-07-07 17:39:21 UTC (rev 17024) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/BasicRegionAdapter.java 2009-07-07 18:26:08 UTC (rev 17025) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2; +package org.hibernate.cache.jbc; import java.util.Collections; import java.util.HashMap; @@ -37,8 +37,8 @@ import org.hibernate.cache.CacheException; import org.hibernate.cache.Region; -import org.hibernate.cache.jbc2.util.CacheHelper; -import org.hibernate.cache.jbc2.util.NonLockingDataVersion; +import org.hibernate.cache.jbc.util.CacheHelper; +import org.hibernate.cache.jbc.util.NonLockingDataVersion; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; import org.jboss.cache.Node; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CacheHelper.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CacheHelper.java 2009-07-07 17:39:21 UTC (rev 17024) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CacheHelper.java 2009-07-07 18:26:08 UTC (rev 17025) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.util; +package org.hibernate.cache.jbc.util; import java.util.Collections; import java.util.Set;

14 years, 10 months

1
0
0 / 0

Hibernate SVN: r17024 - in core/trunk: documentation/jbosscache2/src/main/docbook/en-US/content and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-07-07 13:39:21 -0400 (Tue, 07 Jul 2009) New Revision: 17024 Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheTestUtil.java core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/architecture.xml core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/concepts.xml core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/configuration.xml core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/introduction.xml core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml Log: HHH-4028 - Move current cache-jbosscache2 module content to cache-jbosscache Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheTestUtil.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheTestUtil.java 2009-07-07 17:36:04 UTC (rev 17023) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheTestUtil.java 2009-07-07 17:39:21 UTC (rev 17024) @@ -32,13 +32,13 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.SharedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Settings; -import org.hibernate.test.tm.jbc2.BatchModeTransactionManagerLookup; +import org.hibernate.test.tm.jbc.BatchModeTransactionManagerLookup; /** * Utilities for cache testing. Modified: core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/architecture.xml =================================================================== --- core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/architecture.xml 2009-07-07 17:36:04 UTC (rev 17023) +++ core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/architecture.xml 2009-07-07 17:39:21 UTC (rev 17024) @@ -146,7 +146,7 @@ <para>As part of its startup process, the region factory delegates responsibility for providing JBoss Cache instances to an implementation of the - <literal>org.hibernate.cache.jbc2.CacheInstanceManager</literal> + <literal>org.hibernate.cache.jbc.CacheInstanceManager</literal> interface. The region factory separately requests a JBoss Cache instance for entities, one for collections, one for queries and one for timestamps. Whether the <literal>CacheInstanceManager</literal> Modified: core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/concepts.xml =================================================================== --- core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/concepts.xml 2009-07-07 17:36:04 UTC (rev 17023) +++ core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/concepts.xml 2009-07-07 17:39:21 UTC (rev 17024) @@ -795,7 +795,7 @@ Provide a set of named JBoss Cache configurations in an XML file (or just use the default set included in the <literal>jbc2-configs.xml</literal> file found in the - <literal>org.hibernate.cache.jbc2.builder</literal> package + <literal>org.hibernate.cache.jbc.builder</literal> package in <literal>hibernate-jbosscache2.jar</literal>). </para> </listitem> @@ -871,7 +871,7 @@ Provide a set of named JGroups configurations in an XML file (or just use the default set included in the <literal>jgroups-stacks.xml</literal> file found in the - <literal>org.hibernate.cache.jbc2.builder</literal> package + <literal>org.hibernate.cache.jbc.builder</literal> package in the <literal>hibernate-jbosscache2.jar</literal>). </para> </listitem> Modified: core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/configuration.xml =================================================================== --- core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/configuration.xml 2009-07-07 17:36:04 UTC (rev 17023) +++ core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/configuration.xml 2009-07-07 17:39:21 UTC (rev 17024) @@ -88,8 +88,8 @@ configuration option. </para> - <programlisting><![CDATA[hibernate.cache.region.factory_class= - org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory]]></programlisting> + <programlisting><![CDATA[<![CDATA[hibernate.cache.region.factory_class= + org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory]]>]]></programlisting> <para> To determine the correct factory class, you must decide @@ -130,7 +130,7 @@ <variablelist> <varlistentry> - <term><literal>org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory</literal></term> + <term><literal>org.hibernate.cache.jbc.SharedJBossCacheRegionFactory</literal></term> <listitem> <para> Instantiates a single JBoss Cache instance for use with all @@ -139,7 +139,7 @@ </listitem> </varlistentry> <varlistentry> - <term><literal>org.hibernate.cache.jbc2.JndiSharedJBossCacheRegionFactory</literal></term> + <term><literal>org.hibernate.cache.jbc.JndiSharedJBossCacheRegionFactory</literal></term> <listitem> <para> Uses a single JBoss Cache instance for all cache data types. @@ -151,7 +151,7 @@ </listitem> </varlistentry> <varlistentry> - <term><literal>org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory</literal></term> + <term><literal>org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory</literal></term> <listitem> <para> Supports using multiple JBoss Cache instances with different @@ -163,7 +163,7 @@ </listitem> </varlistentry> <varlistentry> - <term><literal>org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory</literal></term> + <term><literal>org.hibernate.cache.jbc.JndiMultiplexedJBossCacheRegionFactory</literal></term> <listitem> <para> Functions like <literal>JndiMultiplexedJBossCacheRegionFactory</literal>, @@ -342,10 +342,10 @@ just configure the defaults, with query caching enabled: </para> - <programlisting><![CDATA[hibernate.cache.use_second_level_cache=true + <programlisting><![CDATA[<![CDATA[hibernate.cache.use_second_level_cache=true hibernate.cache.use_query_cache=true hibernate.cache.region.factory_class= - org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory]]></programlisting> + org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory]]>]]></programlisting> <para> You would end up using two JBoss Cache instances: @@ -976,7 +976,7 @@ <para> The <literal>jgroups-stacks.xml</literal> file found in the - <literal>org.hibernate.cache.jbc2.builder</literal> package + <literal>org.hibernate.cache.jbc.builder</literal> package in the <literal>hibernate-jbosscache2.jar</literal> provides a good set of standard JGroups configurations; these should be suitable for most needs. If you need to create your own configuration set, we Modified: core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/introduction.xml =================================================================== --- core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/introduction.xml 2009-07-07 17:36:04 UTC (rev 17023) +++ core/trunk/documentation/jbosscache2/src/main/docbook/en-US/content/introduction.xml 2009-07-07 17:39:21 UTC (rev 17024) @@ -98,7 +98,7 @@ is the group communication library used by JBoss Cache for intra-cluster communication.</para></footnote>, need to be on the classpath. The <literal>hibernate-jbosscache2.jar</literal> includes standard - configuration files in the <literal>org.hibernate.cache.jbc2.builder</literal> + configuration files in the <literal>org.hibernate.cache.jbc.builder</literal> package. The <literal>jbc2-configs.xml</literal> file is for JBoss Cache and the <literal>jgroups-stacks.xml</literal> file is for JGroups. See <xref linkend="jbc-config"/> and <xref linkend="jgroups-config"/> @@ -161,8 +161,8 @@ Second Level Cache implementation: </para> - <programlisting><![CDATA[hibernate.cache.region.factory_class= - org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory]]></programlisting> + <programlisting><![CDATA[<![CDATA[hibernate.cache.region.factory_class= + org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory]]>]]></programlisting> <para> There are a number of values that can be provided for the Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2009-07-07 17:36:04 UTC (rev 17023) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2009-07-07 17:39:21 UTC (rev 17024) @@ -732,7 +732,7 @@ </row> <row> <entry>JBoss Cache 2</entry> - <entry><literal>org.hibernate.cache.jbc2.JBossCacheRegionFactory</literal></entry> + <entry><literal>org.hibernate.cache.jbc.JBossCacheRegionFactory</literal></entry> <entry>clustered (ip multicast), transactional</entry> <entry>yes (replication or invalidation)</entry> <entry>yes (clock sync req.)</entry>

14 years, 10 months

1
0
0 / 0

Hibernate SVN: r17023 - in core/trunk/cache-jbosscache/src: main/java/org/hibernate/cache/jbc and 21 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-07-07 13:36:04 -0400 (Tue, 07 Jul 2009) New Revision: 17023 Added: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/ core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc/ Removed: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/ core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc2/ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc2/ Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/CacheInstanceManager.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JBossCacheRegionFactory.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiMultiplexedJBossCacheRegionFactory.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiSharedJBossCacheRegionFactory.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/MultiplexedJBossCacheRegionFactory.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/SharedJBossCacheRegionFactory.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/TransactionalDataRegionAdapter.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/OptimisticTransactionalAccessDelegate.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/TransactionalAccessDelegate.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiMultiplexingCacheInstanceManager.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiSharedCacheInstanceManager.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/CollectionRegionImpl.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticReadOnlyAccess.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticTransactionalAccess.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/ReadOnlyAccess.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/TransactionalAccess.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/EntityRegionImpl.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticReadOnlyAccess.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticTransactionalAccess.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/ReadOnlyAccess.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/TransactionalAccess.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/query/QueryResultsRegionImpl.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/ClusteredConcurrentTimestampsRegionImpl.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/TimestampsRegionImpl.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CircumventChecksDataVersion.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/NonLockingDataVersion.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractEntityCollectionRegionTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractGeneralDataRegionTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractRegionImplTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheComplianceTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheRegionFactoryTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/CacheInstanceManagerTestBase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/MultiplexedCacheInstanceManagerTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/SharedCacheInstanceManagerTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractCollectionRegionAccessStrategyTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractReadOnlyAccessTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractTransactionalAccessTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/CollectionRegionImplTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccInvalidatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReplicatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccTransactionalExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticInvalidatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReplicatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticTransactionalExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticInvalidatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReplicatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticTransactionalExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractEntityRegionAccessStrategyTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractReadOnlyAccessTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractTransactionalAccessTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/EntityRegionImplTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccInvalidatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReplicatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccTransactionalExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticInvalidatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReplicatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticTransactionalExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticInvalidatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReplicatedTransactionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticTransactionalExtraAPITestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractEntityCacheFunctionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractQueryCacheFunctionalTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.hbm.xml core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.hbm.xml core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.hbm.xml core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCEntityReplicationTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCSessionRefreshTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticEntityReplicationTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticSessionRefreshTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticEntityReplicationTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticRepeatableSessionRefreshTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticSessionRefreshTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/VersionedItem.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/MVCCBulkOperationsTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/OptimisticBulkOperationsTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/PessimisticBulkOperationsTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.hbm.xml core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/AccountHolder.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/CacheAccessListener.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/ClassLoaderTestDAO.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/MVCCIsolatedClassLoaderTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/OptimisticIsolatedClassLoaderTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/PessimisticIsolatedClassLoaderTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/CustomClassLoaderCacheManager.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeConnectionProviderImpl.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionImpl.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionManagerImpl.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTestUtil.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTransactionManagerLookup.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestCacheInstanceManager.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestJBossCacheRegionFactory.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/query/QueryRegionImplTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/ClusteredConcurrentTimestampRegionTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/TimestampsRegionImplTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc/BatchModeTransactionManagerLookup.java Log: HHH-4028 - Move current cache-jbosscache2 module content to cache-jbosscache Copied: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc (from rev 17020, core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2) Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/CacheInstanceManager.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/CacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/CacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2; +package org.hibernate.cache.jbc; import java.util.Properties; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JBossCacheRegionFactory.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/JBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2; +package org.hibernate.cache.jbc; import java.util.Properties; @@ -32,12 +32,12 @@ import org.hibernate.cache.QueryResultsRegion; import org.hibernate.cache.RegionFactory; import org.hibernate.cache.TimestampsRegion; -import org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; -import org.hibernate.cache.jbc2.collection.CollectionRegionImpl; -import org.hibernate.cache.jbc2.entity.EntityRegionImpl; -import org.hibernate.cache.jbc2.query.QueryResultsRegionImpl; -import org.hibernate.cache.jbc2.timestamp.TimestampsRegionImpl; +import org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.collection.CollectionRegionImpl; +import org.hibernate.cache.jbc.entity.EntityRegionImpl; +import org.hibernate.cache.jbc.query.QueryResultsRegionImpl; +import org.hibernate.cache.jbc.timestamp.TimestampsRegionImpl; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Settings; import org.hibernate.util.PropertiesHelper; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiMultiplexedJBossCacheRegionFactory.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/JndiMultiplexedJBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiMultiplexedJBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2; +package org.hibernate.cache.jbc; import java.util.Properties; -import org.hibernate.cache.jbc2.builder.JndiMultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager; /** * {@link JBossCacheRegionFactory} that uses Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiSharedJBossCacheRegionFactory.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/JndiSharedJBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/JndiSharedJBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2; +package org.hibernate.cache.jbc; import java.util.Properties; -import org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager; +import org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager; /** * {@link JBossCacheRegionFactory} that uses Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/MultiplexedJBossCacheRegionFactory.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/MultiplexedJBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/MultiplexedJBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2; +package org.hibernate.cache.jbc; import java.util.Properties; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; /** * {@link JBossCacheRegionFactory} that uses Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/SharedJBossCacheRegionFactory.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/SharedJBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/SharedJBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2; +package org.hibernate.cache.jbc; import java.util.Properties; -import org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.jboss.cache.DefaultCacheFactory; /** Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/TransactionalDataRegionAdapter.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/TransactionalDataRegionAdapter.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/TransactionalDataRegionAdapter.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2; +package org.hibernate.cache.jbc; import org.hibernate.cache.CacheDataDescription; import org.hibernate.cache.TransactionalDataRegion; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/OptimisticTransactionalAccessDelegate.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/access/OptimisticTransactionalAccessDelegate.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/OptimisticTransactionalAccessDelegate.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.access; +package org.hibernate.cache.jbc.access; import javax.transaction.Transaction; @@ -29,10 +29,10 @@ import org.hibernate.cache.CacheException; import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cache.access.EntityRegionAccessStrategy; -import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter; -import org.hibernate.cache.jbc2.util.CacheHelper; -import org.hibernate.cache.jbc2.util.DataVersionAdapter; -import org.hibernate.cache.jbc2.util.NonLockingDataVersion; +import org.hibernate.cache.jbc.TransactionalDataRegionAdapter; +import org.hibernate.cache.jbc.util.CacheHelper; +import org.hibernate.cache.jbc.util.DataVersionAdapter; +import org.hibernate.cache.jbc.util.NonLockingDataVersion; import org.jboss.cache.config.Option; import org.jboss.cache.optimistic.DataVersion; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/TransactionalAccessDelegate.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/access/TransactionalAccessDelegate.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/access/TransactionalAccessDelegate.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.access; +package org.hibernate.cache.jbc.access; import java.util.HashSet; import java.util.Set; @@ -34,8 +34,8 @@ import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.access.SoftLock; -import org.hibernate.cache.jbc2.BasicRegionAdapter; -import org.hibernate.cache.jbc2.util.CacheHelper; +import org.hibernate.cache.jbc.BasicRegionAdapter; +import org.hibernate.cache.jbc.util.CacheHelper; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiMultiplexingCacheInstanceManager.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/builder/JndiMultiplexingCacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiMultiplexingCacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.builder; +package org.hibernate.cache.jbc.builder; import java.util.Properties; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiSharedCacheInstanceManager.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/builder/JndiSharedCacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/JndiSharedCacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.builder; +package org.hibernate.cache.jbc.builder; import java.util.Properties; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/builder/MultiplexingCacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.builder; +package org.hibernate.cache.jbc.builder; import java.util.Properties; import javax.transaction.TransactionManager; @@ -37,8 +37,8 @@ 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.cache.jbc.CacheInstanceManager; +import org.hibernate.cache.jbc.util.CacheHelper; import org.hibernate.cfg.Settings; import org.hibernate.transaction.TransactionManagerLookup; import org.hibernate.util.PropertiesHelper; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/builder/SharedCacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.builder; +package org.hibernate.cache.jbc.builder; import java.util.Properties; import javax.transaction.TransactionManager; @@ -36,8 +36,8 @@ import org.jgroups.JChannelFactory; import org.hibernate.cache.CacheException; -import org.hibernate.cache.jbc2.CacheInstanceManager; -import org.hibernate.cache.jbc2.util.CacheHelper; +import org.hibernate.cache.jbc.CacheInstanceManager; +import org.hibernate.cache.jbc.util.CacheHelper; import org.hibernate.cfg.Settings; import org.hibernate.util.PropertiesHelper; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/CollectionRegionImpl.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/collection/CollectionRegionImpl.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/CollectionRegionImpl.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.collection; +package org.hibernate.cache.jbc.collection; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; @@ -33,7 +33,7 @@ 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.hibernate.cache.jbc.TransactionalDataRegionAdapter; /** * Defines the behavior of the collection cache regions for JBossCache 2.x. Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticReadOnlyAccess.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/collection/OptimisticReadOnlyAccess.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticReadOnlyAccess.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.collection; +package org.hibernate.cache.jbc.collection; import org.hibernate.cache.CacheException; import org.hibernate.cache.access.SoftLock; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticTransactionalAccess.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/collection/OptimisticTransactionalAccess.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/OptimisticTransactionalAccess.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.collection; +package org.hibernate.cache.jbc.collection; -import org.hibernate.cache.jbc2.access.OptimisticTransactionalAccessDelegate; +import org.hibernate.cache.jbc.access.OptimisticTransactionalAccessDelegate; /** * Defines the strategy for transactional access to entity data in an Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/ReadOnlyAccess.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/collection/ReadOnlyAccess.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/ReadOnlyAccess.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.collection; +package org.hibernate.cache.jbc.collection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/TransactionalAccess.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/collection/TransactionalAccess.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/collection/TransactionalAccess.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.collection; +package org.hibernate.cache.jbc.collection; 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.jbc2.access.TransactionalAccessDelegate; +import org.hibernate.cache.jbc.access.TransactionalAccessDelegate; /** * This defines the strategy for transactional access to collection data in a Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/EntityRegionImpl.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/entity/EntityRegionImpl.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/EntityRegionImpl.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.entity; +package org.hibernate.cache.jbc.entity; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; @@ -33,7 +33,7 @@ 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.hibernate.cache.jbc.TransactionalDataRegionAdapter; /** * Defines the behavior of the entity cache regions for JBossCache. Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticReadOnlyAccess.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/entity/OptimisticReadOnlyAccess.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticReadOnlyAccess.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.entity; +package org.hibernate.cache.jbc.entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticTransactionalAccess.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/entity/OptimisticTransactionalAccess.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/OptimisticTransactionalAccess.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -22,9 +22,9 @@ * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.entity; +package org.hibernate.cache.jbc.entity; -import org.hibernate.cache.jbc2.access.OptimisticTransactionalAccessDelegate; +import org.hibernate.cache.jbc.access.OptimisticTransactionalAccessDelegate; /** * Defines the strategy for transactional access to entity data in an Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/ReadOnlyAccess.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/entity/ReadOnlyAccess.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/ReadOnlyAccess.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.entity; +package org.hibernate.cache.jbc.entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/TransactionalAccess.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/entity/TransactionalAccess.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/entity/TransactionalAccess.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.entity; +package org.hibernate.cache.jbc.entity; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.access.SoftLock; -import org.hibernate.cache.jbc2.access.TransactionalAccessDelegate; +import org.hibernate.cache.jbc.access.TransactionalAccessDelegate; import org.hibernate.cache.EntityRegion; import org.hibernate.cache.CacheException; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/query/QueryResultsRegionImpl.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/query/QueryResultsRegionImpl.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/query/QueryResultsRegionImpl.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.query; +package org.hibernate.cache.jbc.query; import java.util.Properties; @@ -29,8 +29,8 @@ import org.hibernate.cache.CacheException; import org.hibernate.cache.QueryResultsRegion; -import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter; -import org.hibernate.cache.jbc2.util.CacheHelper; +import org.hibernate.cache.jbc.TransactionalDataRegionAdapter; +import org.hibernate.cache.jbc.util.CacheHelper; import org.hibernate.util.PropertiesHelper; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/ClusteredConcurrentTimestampsRegionImpl.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/timestamp/ClusteredConcurrentTimestampsRegionImpl.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/ClusteredConcurrentTimestampsRegionImpl.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,7 +14,7 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.cache.jbc2.timestamp; +package org.hibernate.cache.jbc.timestamp; import java.util.Properties; import java.util.Set; @@ -25,8 +25,8 @@ import org.hibernate.cache.CacheException; import org.hibernate.cache.TimestampsRegion; -import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter; -import org.hibernate.cache.jbc2.util.CacheHelper; +import org.hibernate.cache.jbc.TransactionalDataRegionAdapter; +import org.hibernate.cache.jbc.util.CacheHelper; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; import org.jboss.cache.config.Option; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/TimestampsRegionImpl.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/timestamp/TimestampsRegionImpl.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/timestamp/TimestampsRegionImpl.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.timestamp; +package org.hibernate.cache.jbc.timestamp; import java.util.Map; import java.util.Properties; @@ -33,8 +33,8 @@ import org.hibernate.cache.CacheException; import org.hibernate.cache.TimestampsRegion; -import org.hibernate.cache.jbc2.TransactionalDataRegionAdapter; -import org.hibernate.cache.jbc2.util.CacheHelper; +import org.hibernate.cache.jbc.TransactionalDataRegionAdapter; +import org.hibernate.cache.jbc.util.CacheHelper; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; import org.jboss.cache.config.Option; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CircumventChecksDataVersion.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/util/CircumventChecksDataVersion.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/CircumventChecksDataVersion.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.util; +package org.hibernate.cache.jbc.util; import org.hibernate.cache.CacheException; import org.jboss.cache.config.Option; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/util/DataVersionAdapter.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/DataVersionAdapter.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.util; +package org.hibernate.cache.jbc.util; import java.io.IOException; import java.util.Comparator; -import org.hibernate.cache.jbc2.entity.TransactionalAccess; +import org.hibernate.cache.jbc.entity.TransactionalAccess; import org.hibernate.util.CalendarComparator; import org.hibernate.util.ComparableComparator; import org.jboss.cache.optimistic.DataVersion; Modified: core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/NonLockingDataVersion.java =================================================================== --- core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc2/util/NonLockingDataVersion.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/util/NonLockingDataVersion.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.jbc2.util; +package org.hibernate.cache.jbc.util; -import org.hibernate.cache.jbc2.entity.TransactionalAccess; +import org.hibernate.cache.jbc.entity.TransactionalAccess; import org.jboss.cache.config.Option; import org.jboss.cache.optimistic.DataVersion; import org.slf4j.Logger; Copied: core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc (from rev 17020, core/trunk/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc2) Copied: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc (from rev 17020, core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2) Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractEntityCollectionRegionTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/AbstractEntityCollectionRegionTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractEntityCollectionRegionTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2; +package org.hibernate.test.cache.jbc; import java.util.Properties; @@ -29,11 +29,11 @@ import org.hibernate.cache.RegionFactory; import org.hibernate.cache.TransactionalDataRegion; import org.hibernate.cache.access.AccessType; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.SharedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractGeneralDataRegionTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/AbstractGeneralDataRegionTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractGeneralDataRegionTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,20 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2; +package org.hibernate.test.cache.jbc; import java.util.Iterator; -import java.util.Set; -import org.hibernate.cache.CacheException; import org.hibernate.cache.GeneralDataRegion; import org.hibernate.cache.QueryResultsRegion; import org.hibernate.cache.Region; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; -import org.hibernate.cache.jbc2.util.CacheHelper; -import org.hibernate.cache.jbc2.util.NonLockingDataVersion; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.util.CacheHelper; +import org.hibernate.cache.jbc.util.NonLockingDataVersion; import org.hibernate.cfg.Configuration; import org.hibernate.test.util.CacheTestUtil; import org.jboss.cache.Cache; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/AbstractJBossCacheTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2; +package org.hibernate.test.cache.jbc; import java.util.Set; import org.hibernate.cache.RegionFactory; -import org.hibernate.cache.jbc2.util.CacheHelper; +import org.hibernate.cache.jbc.util.CacheHelper; import org.hibernate.junit.UnitTestCase; import org.hibernate.test.util.CacheTestSupport; import org.jboss.cache.Cache; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractRegionImplTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/AbstractRegionImplTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractRegionImplTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2; +package org.hibernate.test.cache.jbc; import java.util.Map; import java.util.Properties; @@ -29,9 +29,9 @@ import org.hibernate.cache.CacheDataDescription; import org.hibernate.cache.Region; import org.hibernate.cache.impl.CacheDataDescriptionImpl; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.SharedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; import org.hibernate.test.util.CacheTestUtil; import org.hibernate.util.ComparableComparator; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheComplianceTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/JBossCacheComplianceTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheComplianceTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2; +package org.hibernate.test.cache.jbc; import junit.framework.TestCase; import org.hibernate.cache.RegionFactory; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; -import org.hibernate.cache.jbc2.util.CacheHelper; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.util.CacheHelper; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Settings; import org.hibernate.test.util.CacheTestSupport; @@ -67,7 +67,7 @@ } protected String getConfigResourceLocation() { - return "org/hibernate/test/cache/jbc2/functional/optimistic-treecache.xml"; + return "org/hibernate/test/cache/jbc/functional/optimistic-treecache.xml"; } protected Class<? extends RegionFactory> getCacheRegionFactory() { Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheRegionFactoryTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/JBossCacheRegionFactoryTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JBossCacheRegionFactoryTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2; +package org.hibernate.test.cache.jbc; import java.util.Properties; -import org.hibernate.cache.jbc2.CacheInstanceManager; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.CacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Settings; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/Jbc2ConfigsXmlValidityTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,7 +14,7 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2; +package org.hibernate.test.cache.jbc; import java.util.HashSet; import java.util.Set; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/CacheInstanceManagerTestBase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/builder/CacheInstanceManagerTestBase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/CacheInstanceManagerTestBase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.builder; +package org.hibernate.test.cache.jbc.builder; -import org.hibernate.cache.jbc2.CacheInstanceManager; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.CacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; import org.hibernate.cfg.Configuration; -import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase; +import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase; import org.hibernate.test.util.CacheTestUtil; /** Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/MultiplexedCacheInstanceManagerTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/builder/MultiplexedCacheInstanceManagerTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/MultiplexedCacheInstanceManagerTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.builder; +package org.hibernate.test.cache.jbc.builder; -import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory; /** Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/SharedCacheInstanceManagerTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/builder/SharedCacheInstanceManagerTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/builder/SharedCacheInstanceManagerTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.builder; +package org.hibernate.test.cache.jbc.builder; -import org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.SharedJBossCacheRegionFactory; /** * A SharedCacheInstanceManagerTestCase. Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractCollectionRegionAccessStrategyTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractCollectionRegionAccessStrategyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractCollectionRegionAccessStrategyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,10 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; -import java.util.Iterator; -import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -34,21 +32,20 @@ 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; import org.hibernate.cache.impl.CacheDataDescriptionImpl; -import org.hibernate.cache.jbc2.BasicRegionAdapter; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; -import org.hibernate.cache.jbc2.collection.CollectionRegionImpl; -import org.hibernate.cache.jbc2.entity.TransactionalAccess; -import org.hibernate.cache.jbc2.util.CacheHelper; -import org.hibernate.cache.jbc2.util.NonLockingDataVersion; +import org.hibernate.cache.jbc.BasicRegionAdapter; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.collection.CollectionRegionImpl; +import org.hibernate.cache.jbc.entity.TransactionalAccess; +import org.hibernate.cache.jbc.util.CacheHelper; +import org.hibernate.cache.jbc.util.NonLockingDataVersion; import org.hibernate.cfg.Configuration; -import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase; +import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase; import org.hibernate.test.util.CacheTestUtil; import org.hibernate.util.ComparableComparator; import org.jboss.cache.Cache; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractReadOnlyAccessTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractReadOnlyAccessTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractReadOnlyAccessTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.cache.access.AccessType; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractTransactionalAccessTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/AbstractTransactionalAccessTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/AbstractTransactionalAccessTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.cache.access.AccessType; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/CollectionRegionImplTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/CollectionRegionImplTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/CollectionRegionImplTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import java.util.Properties; @@ -32,11 +32,11 @@ import org.hibernate.cache.RegionFactory; import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.CollectionRegionAccessStrategy; -import org.hibernate.cache.jbc2.BasicRegionAdapter; -import org.hibernate.cache.jbc2.CacheInstanceManager; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.collection.CollectionRegionImpl; -import org.hibernate.test.cache.jbc2.AbstractEntityCollectionRegionTestCase; +import org.hibernate.cache.jbc.BasicRegionAdapter; +import org.hibernate.cache.jbc.CacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.collection.CollectionRegionImpl; +import org.hibernate.test.cache.jbc.AbstractEntityCollectionRegionTestCase; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccInvalidatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/MvccInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/MvccReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.cache.access.CollectionRegionAccessStrategy; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/MvccReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReplicatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/MvccReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import junit.framework.Test; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccTransactionalExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/MvccTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/MvccTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.cache.access.CollectionRegionAccessStrategy; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticInvalidatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.CollectionRegionAccessStrategy; -import org.hibernate.cache.jbc2.entity.TransactionalAccess; +import org.hibernate.cache.jbc.entity.TransactionalAccess; /** * Tests for the "extra API" in EntityRegionAccessStrategy; in this Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReplicatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import junit.framework.Test; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticTransactionalExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/OptimisticTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/OptimisticTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,18 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.cache.CollectionRegion; import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cache.access.SoftLock; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; -import org.hibernate.cache.jbc2.entity.TransactionalAccess; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.entity.TransactionalAccess; import org.hibernate.cfg.Configuration; -import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase; +import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase; import org.hibernate.test.util.CacheTestUtil; import org.jboss.cache.Cache; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticInvalidatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.cache.access.CollectionRegionAccessStrategy; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReplicatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import junit.framework.Test; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticTransactionalExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/collection/PessimisticTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/collection/PessimisticTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.collection; +package org.hibernate.test.cache.jbc.collection; import org.hibernate.cache.access.CollectionRegionAccessStrategy; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractEntityRegionAccessStrategyTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractEntityRegionAccessStrategyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractEntityRegionAccessStrategyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -36,16 +36,16 @@ import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.impl.CacheDataDescriptionImpl; -import org.hibernate.cache.jbc2.BasicRegionAdapter; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; -import org.hibernate.cache.jbc2.entity.EntityRegionImpl; -import org.hibernate.cache.jbc2.entity.TransactionalAccess; -import org.hibernate.cache.jbc2.util.CacheHelper; -import org.hibernate.cache.jbc2.util.NonLockingDataVersion; +import org.hibernate.cache.jbc.BasicRegionAdapter; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.entity.EntityRegionImpl; +import org.hibernate.cache.jbc.entity.TransactionalAccess; +import org.hibernate.cache.jbc.util.CacheHelper; +import org.hibernate.cache.jbc.util.NonLockingDataVersion; import org.hibernate.cfg.Configuration; -import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase; +import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase; import org.hibernate.test.util.CacheTestUtil; import org.hibernate.util.ComparableComparator; import org.jboss.cache.Cache; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractReadOnlyAccessTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractReadOnlyAccessTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractReadOnlyAccessTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.cache.access.AccessType; import org.jboss.cache.transaction.BatchModeTransactionManager; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractTransactionalAccessTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/AbstractTransactionalAccessTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/AbstractTransactionalAccessTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/EntityRegionImplTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/EntityRegionImplTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/EntityRegionImplTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import java.util.Properties; @@ -31,11 +31,11 @@ import org.hibernate.cache.Region; import org.hibernate.cache.RegionFactory; import org.hibernate.cache.access.AccessType; -import org.hibernate.cache.jbc2.BasicRegionAdapter; -import org.hibernate.cache.jbc2.CacheInstanceManager; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.entity.EntityRegionImpl; -import org.hibernate.test.cache.jbc2.AbstractEntityCollectionRegionTestCase; +import org.hibernate.cache.jbc.BasicRegionAdapter; +import org.hibernate.cache.jbc.CacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.entity.EntityRegionImpl; +import org.hibernate.test.cache.jbc.AbstractEntityCollectionRegionTestCase; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccInvalidatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/MvccInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/MvccReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.cache.access.EntityRegionAccessStrategy; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/MvccReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReplicatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/MvccReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import junit.framework.Test; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccTransactionalExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/MvccTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/MvccTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.cache.access.EntityRegionAccessStrategy; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticInvalidatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.EntityRegionAccessStrategy; -import org.hibernate.cache.jbc2.entity.TransactionalAccess; +import org.hibernate.cache.jbc.entity.TransactionalAccess; /** * Tests for the "extra API" in EntityRegionAccessStrategy; in this Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReplicatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import junit.framework.Test; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticTransactionalExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/OptimisticTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/OptimisticTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,18 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.cache.EntityRegion; import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.access.SoftLock; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; -import org.hibernate.cache.jbc2.entity.TransactionalAccess; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.entity.TransactionalAccess; import org.hibernate.cfg.Configuration; -import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase; +import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase; import org.hibernate.test.util.CacheTestUtil; import org.jboss.cache.Cache; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticInvalidatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticInvalidatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticInvalidatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticReadOnlyExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.cache.access.EntityRegionAccessStrategy; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticReadOnlyTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReadOnlyTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReplicatedTransactionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticReplicatedTransactionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticReplicatedTransactionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import junit.framework.Test; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticTransactionalExtraAPITestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/entity/PessimisticTransactionalExtraAPITestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/entity/PessimisticTransactionalExtraAPITestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.entity; +package org.hibernate.test.cache.jbc.entity; import org.hibernate.cache.access.EntityRegionAccessStrategy; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractEntityCacheFunctionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractEntityCacheFunctionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import java.util.Map; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractQueryCacheFunctionalTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/AbstractQueryCacheFunctionalTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import java.util.Map; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.hbm.xml =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.hbm.xml 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.hbm.xml 2009-07-07 17:36:04 UTC (rev 17023) @@ -27,7 +27,7 @@ ~ Boston, MA 02110-1301 USA --> <hibernate-mapping - package="org.hibernate.test.cache.jbc2.functional"> + package="org.hibernate.test.cache.jbc.functional"> <class name="Contact" table="Contacts"> @@ -41,7 +41,7 @@ <property name="tlf" not-null="true"/> <many-to-one name="customer" - class="org.hibernate.test.cache.jbc2.functional.Customer" + class="org.hibernate.test.cache.jbc.functional.Customer" column="CUSTOMER_ID"/> </class> Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Contact.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Contact.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import java.io.Serializable; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.hbm.xml =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.hbm.xml 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.hbm.xml 2009-07-07 17:36:04 UTC (rev 17023) @@ -27,7 +27,7 @@ ~ Boston, MA 02110-1301 USA --> <hibernate-mapping - package="org.hibernate.test.cache.jbc2.functional"> + package="org.hibernate.test.cache.jbc.functional"> <class name="Customer" table="Customers"> @@ -42,7 +42,7 @@ <set name="contacts" cascade="all" lazy="false"> <cache usage="transactional"/> <key column="CUSTOMER_ID"/> - <one-to-many class="org.hibernate.test.cache.jbc2.functional.Contact"/> + <one-to-many class="org.hibernate.test.cache.jbc.functional.Contact"/> </set> </class> Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Customer.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Customer.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import java.io.Serializable; import java.util.Set; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/DualNodeTestCaseBase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,17 +14,17 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Mappings; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.junit.functional.ExecutionEnvironment; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeConnectionProviderImpl; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeJtaTransactionManagerImpl; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeTransactionManagerLookup; +import org.hibernate.test.cache.jbc.functional.util.DualNodeConnectionProviderImpl; +import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl; +import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil; +import org.hibernate.test.cache.jbc.functional.util.DualNodeTransactionManagerLookup; import org.hibernate.transaction.CMTTransactionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.hbm.xml =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Item.hbm.xml 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.hbm.xml 2009-07-07 17:36:04 UTC (rev 17023) @@ -27,7 +27,7 @@ ~ Boston, MA 02110-1301 USA --> <hibernate-mapping - package="org.hibernate.test.cache.jbc2.functional"> + package="org.hibernate.test.cache.jbc.functional"> <class name="Item" table="Items"> <id name="id"> Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/Item.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/Item.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; /** * @author Gavin King Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCConcurrentWriteTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import java.io.PrintWriter; import java.io.StringWriter; @@ -33,7 +33,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.transaction.SystemException; import javax.transaction.Transaction; import junit.framework.Test; @@ -41,15 +40,15 @@ import org.hibernate.FlushMode; import org.hibernate.Session; import org.hibernate.cache.RegionFactory; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; import org.hibernate.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.SecondLevelCacheStatistics; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeConnectionProviderImpl; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeJtaTransactionManagerImpl; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeTransactionManagerLookup; +import org.hibernate.test.cache.jbc.functional.util.DualNodeConnectionProviderImpl; +import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl; +import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil; +import org.hibernate.test.cache.jbc.functional.util.DualNodeTransactionManagerLookup; import org.hibernate.transaction.CMTTransactionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,7 +59,7 @@ */ public class MVCCConcurrentWriteTest extends CacheTestCaseBase { - private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc2/functional/mvcc-treecache.xml"; + private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc/functional/mvcc-treecache.xml"; private static final Logger LOG = LoggerFactory.getLogger(MVCCConcurrentWriteTest.class); /** Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCEntityReplicationTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCEntityReplicationTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCEntityReplicationTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; /** Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCJBossCacheTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import junit.framework.Test; import org.hibernate.cache.RegionFactory; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; import org.hibernate.junit.functional.FunctionalTestClassTestSuite; @@ -38,7 +38,7 @@ */ public class MVCCJBossCacheTest extends AbstractQueryCacheFunctionalTestCase { - private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc2/functional/mvcc-treecache.xml"; + private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc/functional/mvcc-treecache.xml"; public MVCCJBossCacheTest(String x) { super(x); Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCSessionRefreshTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/MVCCSessionRefreshTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCSessionRefreshTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,12 +14,12 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import junit.framework.Test; import junit.framework.TestSuite; -import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup; +import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup; /** * A SessionRefreshTest that uses an OPTIMISTIC cache config. Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticEntityReplicationTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/OptimisticEntityReplicationTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticEntityReplicationTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; /** Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/OptimisticJBossCacheTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import junit.framework.Test; import org.hibernate.cache.RegionFactory; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; import org.hibernate.junit.functional.FunctionalTestClassTestSuite; @@ -38,7 +38,7 @@ */ public class OptimisticJBossCacheTest extends AbstractQueryCacheFunctionalTestCase { - private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc2/functional/optimistic-treecache.xml"; + private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc/functional/optimistic-treecache.xml"; public OptimisticJBossCacheTest(String x) { super(x); Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticSessionRefreshTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/OptimisticSessionRefreshTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticSessionRefreshTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,12 +14,12 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import junit.framework.Test; import junit.framework.TestSuite; -import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup; +import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup; /** * A SessionRefreshTest that uses an OPTIMISTIC cache config. Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticEntityReplicationTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticEntityReplicationTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticEntityReplicationTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import java.util.HashSet; import java.util.Set; @@ -30,11 +30,11 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; import org.hibernate.cfg.Configuration; -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.test.cache.jbc.functional.util.DualNodeTestUtil; +import org.hibernate.test.cache.jbc.functional.util.TestCacheInstanceManager; +import org.hibernate.test.cache.jbc.functional.util.TestJBossCacheRegionFactory; import org.jboss.cache.Cache; import org.jboss.cache.CacheManager; import org.jboss.cache.Fqn; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticJBossCacheTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import junit.framework.Test; import org.hibernate.cache.RegionFactory; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.SharedCacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; import org.hibernate.junit.functional.FunctionalTestClassTestSuite; @@ -38,7 +38,7 @@ */ public class PessimisticJBossCacheTest extends AbstractQueryCacheFunctionalTestCase { - private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc2/functional/pessimistic-treecache.xml"; + private static final String JBC_CONFIG = "org/hibernate/test/cache/jbc/functional/pessimistic-treecache.xml"; public PessimisticJBossCacheTest(String x) { super(x); Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticRepeatableSessionRefreshTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticRepeatableSessionRefreshTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticRepeatableSessionRefreshTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,12 +14,12 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import junit.framework.Test; import junit.framework.TestSuite; -import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup; +import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup; /** * A PessimisticSessionRefreshTest that uses a REPEATABLE_READ cache config. Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticSessionRefreshTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/PessimisticSessionRefreshTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticSessionRefreshTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,7 +14,7 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; import javax.transaction.TransactionManager; @@ -22,16 +22,16 @@ import junit.framework.TestSuite; import org.hibernate.SessionFactory; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.test.cache.jbc2.functional.classloader.Account; -import org.hibernate.test.cache.jbc2.functional.classloader.ClassLoaderTestDAO; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeJtaTransactionManagerImpl; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil; -import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup; -import org.hibernate.test.cache.jbc2.functional.util.TestCacheInstanceManager; -import org.hibernate.test.cache.jbc2.functional.util.TestJBossCacheRegionFactory; +import org.hibernate.test.cache.jbc.functional.classloader.Account; +import org.hibernate.test.cache.jbc.functional.classloader.ClassLoaderTestDAO; +import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl; +import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil; +import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup; +import org.hibernate.test.cache.jbc.functional.util.TestCacheInstanceManager; +import org.hibernate.test.cache.jbc.functional.util.TestJBossCacheRegionFactory; import org.jboss.cache.Cache; import org.jboss.cache.CacheManager; import org.slf4j.Logger; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/VersionedItem.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/VersionedItem.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/VersionedItem.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional; +package org.hibernate.test.cache.jbc.functional; /** * @author Steve Ebersole Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/MVCCBulkOperationsTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/MVCCBulkOperationsTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/MVCCBulkOperationsTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -20,11 +20,10 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.hibernate.test.cache.jbc2.functional.bulk; +package org.hibernate.test.cache.jbc.functional.bulk; import junit.framework.Test; -import org.hibernate.test.cache.jbc2.collection.OptimisticInvalidatedTransactionalTestCase; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/OptimisticBulkOperationsTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/OptimisticBulkOperationsTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -20,11 +20,10 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.hibernate.test.cache.jbc2.functional.bulk; +package org.hibernate.test.cache.jbc.functional.bulk; import junit.framework.Test; -import org.hibernate.test.cache.jbc2.collection.OptimisticInvalidatedTransactionalTestCase; import org.hibernate.test.util.CacheTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/PessimisticBulkOperationsTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/PessimisticBulkOperationsTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/PessimisticBulkOperationsTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -19,22 +19,21 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.hibernate.test.cache.jbc2.functional.bulk; +package org.hibernate.test.cache.jbc.functional.bulk; import java.util.HashSet; import java.util.List; import java.util.Set; import org.hibernate.FlushMode; -import org.hibernate.cache.RegionFactory; -import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; import org.hibernate.cfg.Configuration; import org.hibernate.classic.Session; import org.hibernate.stat.SecondLevelCacheStatistics; -import org.hibernate.test.cache.jbc2.functional.CacheTestCaseBase; -import org.hibernate.test.cache.jbc2.functional.Contact; -import org.hibernate.test.cache.jbc2.functional.Customer; +import org.hibernate.test.cache.jbc.functional.CacheTestCaseBase; +import org.hibernate.test.cache.jbc.functional.Contact; +import org.hibernate.test.cache.jbc.functional.Customer; import org.hibernate.test.tm.SimpleJtaTransactionManagerImpl; import org.hibernate.transaction.CMTTransactionFactory; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.hbm.xml =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.hbm.xml 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.hbm.xml 2009-07-07 17:36:04 UTC (rev 17023) @@ -27,7 +27,7 @@ ~ Boston, MA 02110-1301 USA --> <hibernate-mapping - package="org.hibernate.test.cache.jbc2.functional.classloader"> + package="org.hibernate.test.cache.jbc.functional.classloader"> <class name="Account" table="Accounts"> Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/Account.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/Account.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional.classloader; +package org.hibernate.test.cache.jbc.functional.classloader; import java.io.Serializable; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/AccountHolder.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/AccountHolder.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/AccountHolder.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional.classloader; +package org.hibernate.test.cache.jbc.functional.classloader; import java.io.IOException; import java.io.ObjectInputStream; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/CacheAccessListener.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/CacheAccessListener.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/CacheAccessListener.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional.classloader; +package org.hibernate.test.cache.jbc.functional.classloader; import java.util.HashSet; import java.util.Iterator; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/ClassLoaderTestDAO.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/ClassLoaderTestDAO.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/ClassLoaderTestDAO.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.hibernate.test.cache.jbc2.functional.classloader; +package org.hibernate.test.cache.jbc.functional.classloader; import java.lang.reflect.Method; import java.util.Iterator; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/MVCCIsolatedClassLoaderTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/MVCCIsolatedClassLoaderTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/MVCCIsolatedClassLoaderTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,12 +14,12 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.functional.classloader; +package org.hibernate.test.cache.jbc.functional.classloader; import junit.framework.Test; import junit.framework.TestSuite; -import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup; +import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup; /** * Optimistic locking version of IsolatedClassLoaderTest. Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/OptimisticIsolatedClassLoaderTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/OptimisticIsolatedClassLoaderTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/OptimisticIsolatedClassLoaderTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,12 +14,12 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.functional.classloader; +package org.hibernate.test.cache.jbc.functional.classloader; import junit.framework.Test; import junit.framework.TestSuite; -import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup; +import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup; /** * Optimistic locking version of IsolatedClassLoaderTest. Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/PessimisticIsolatedClassLoaderTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/classloader/PessimisticIsolatedClassLoaderTest.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/classloader/PessimisticIsolatedClassLoaderTest.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional.classloader; +package org.hibernate.test.cache.jbc.functional.classloader; import javax.transaction.TransactionManager; @@ -31,16 +31,16 @@ import org.hibernate.SessionFactory; import org.hibernate.cache.StandardQueryCache; -import org.hibernate.cache.jbc2.BasicRegionAdapter; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; -import org.hibernate.cache.jbc2.query.QueryResultsRegionImpl; +import org.hibernate.cache.jbc.BasicRegionAdapter; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.query.QueryResultsRegionImpl; import org.hibernate.cfg.Configuration; -import org.hibernate.test.cache.jbc2.functional.DualNodeTestCaseBase; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeJtaTransactionManagerImpl; -import org.hibernate.test.cache.jbc2.functional.util.DualNodeTestUtil; -import org.hibernate.test.cache.jbc2.functional.util.IsolatedCacheTestSetup; -import org.hibernate.test.cache.jbc2.functional.util.TestCacheInstanceManager; -import org.hibernate.test.cache.jbc2.functional.util.TestJBossCacheRegionFactory; +import org.hibernate.test.cache.jbc.functional.DualNodeTestCaseBase; +import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl; +import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil; +import org.hibernate.test.cache.jbc.functional.util.IsolatedCacheTestSetup; +import org.hibernate.test.cache.jbc.functional.util.TestCacheInstanceManager; +import org.hibernate.test.cache.jbc.functional.util.TestJBossCacheRegionFactory; import org.jboss.cache.Cache; import org.jboss.cache.CacheManager; import org.jboss.cache.Fqn; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/CustomClassLoaderCacheManager.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/CustomClassLoaderCacheManager.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/CustomClassLoaderCacheManager.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,7 +14,7 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.functional.util; +package org.hibernate.test.cache.jbc.functional.util; import org.jboss.cache.Cache; import org.jboss.cache.CacheManagerImpl; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeConnectionProviderImpl.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeConnectionProviderImpl.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeConnectionProviderImpl.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional.util; +package org.hibernate.test.cache.jbc.functional.util; import java.sql.Connection; import java.sql.SQLException; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionImpl.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeJtaTransactionImpl.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionImpl.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional.util; +package org.hibernate.test.cache.jbc.functional.util; import java.sql.Connection; import java.sql.SQLException; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionManagerImpl.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeJtaTransactionManagerImpl.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeJtaTransactionManagerImpl.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional.util; +package org.hibernate.test.cache.jbc.functional.util; import java.util.Hashtable; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTestUtil.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTestUtil.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTestUtil.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,7 +14,7 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.functional.util; +package org.hibernate.test.cache.jbc.functional.util; /** * A DualNodeTestUtil. Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTransactionManagerLookup.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/DualNodeTransactionManagerLookup.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional.util; +package org.hibernate.test.cache.jbc.functional.util; import java.util.Properties; import javax.transaction.TransactionManager; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/IsolatedCacheTestSetup.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,7 +14,7 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.functional.util; +package org.hibernate.test.cache.jbc.functional.util; import junit.framework.Test; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestCacheInstanceManager.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/TestCacheInstanceManager.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestCacheInstanceManager.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional.util; +package org.hibernate.test.cache.jbc.functional.util; import java.util.Hashtable; import java.util.Properties; import org.hibernate.cache.CacheException; -import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager; +import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager; import org.hibernate.cfg.Settings; import org.jboss.cache.CacheManager; import org.jboss.cache.CacheManagerImpl; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestJBossCacheRegionFactory.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/functional/util/TestJBossCacheRegionFactory.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/TestJBossCacheRegionFactory.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.functional.util; +package org.hibernate.test.cache.jbc.functional.util; import java.util.Properties; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; import org.jboss.cache.CacheManager; /** Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/query/QueryRegionImplTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/query/QueryRegionImplTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/query/QueryRegionImplTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.query; +package org.hibernate.test.cache.jbc.query; import java.util.Properties; import java.util.concurrent.CountDownLatch; @@ -33,12 +33,12 @@ import org.hibernate.cache.QueryResultsRegion; import org.hibernate.cache.Region; import org.hibernate.cache.StandardQueryCache; -import org.hibernate.cache.jbc2.BasicRegionAdapter; -import org.hibernate.cache.jbc2.CacheInstanceManager; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.query.QueryResultsRegionImpl; +import org.hibernate.cache.jbc.BasicRegionAdapter; +import org.hibernate.cache.jbc.CacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.query.QueryResultsRegionImpl; import org.hibernate.cfg.Configuration; -import org.hibernate.test.cache.jbc2.AbstractGeneralDataRegionTestCase; +import org.hibernate.test.cache.jbc.AbstractGeneralDataRegionTestCase; import org.hibernate.test.util.CacheTestUtil; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/ClusteredConcurrentTimestampRegionTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/timestamp/ClusteredConcurrentTimestampRegionTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/ClusteredConcurrentTimestampRegionTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -14,7 +14,7 @@ * Red Hat Author(s): Brian Stansberry */ -package org.hibernate.test.cache.jbc2.timestamp; +package org.hibernate.test.cache.jbc.timestamp; import java.util.Properties; import java.util.Random; @@ -22,12 +22,12 @@ import junit.framework.AssertionFailedError; import org.hibernate.cache.UpdateTimestampsCache; -import org.hibernate.cache.jbc2.CacheInstanceManager; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory; -import org.hibernate.cache.jbc2.timestamp.ClusteredConcurrentTimestampsRegionImpl; +import org.hibernate.cache.jbc.CacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.MultiplexedJBossCacheRegionFactory; +import org.hibernate.cache.jbc.timestamp.ClusteredConcurrentTimestampsRegionImpl; import org.hibernate.cfg.Configuration; -import org.hibernate.test.cache.jbc2.AbstractJBossCacheTestCase; +import org.hibernate.test.cache.jbc.AbstractJBossCacheTestCase; import org.hibernate.test.util.CacheTestUtil; import org.jboss.cache.Cache; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/TimestampsRegionImplTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc2/timestamp/TimestampsRegionImplTestCase.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/timestamp/TimestampsRegionImplTestCase.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,18 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.cache.jbc2.timestamp; +package org.hibernate.test.cache.jbc.timestamp; import java.util.Properties; import org.hibernate.cache.CacheDataDescription; import org.hibernate.cache.Region; import org.hibernate.cache.UpdateTimestampsCache; -import org.hibernate.cache.jbc2.BasicRegionAdapter; -import org.hibernate.cache.jbc2.CacheInstanceManager; -import org.hibernate.cache.jbc2.JBossCacheRegionFactory; -import org.hibernate.cache.jbc2.timestamp.TimestampsRegionImpl; -import org.hibernate.test.cache.jbc2.AbstractGeneralDataRegionTestCase; +import org.hibernate.cache.jbc.BasicRegionAdapter; +import org.hibernate.cache.jbc.CacheInstanceManager; +import org.hibernate.cache.jbc.JBossCacheRegionFactory; +import org.hibernate.cache.jbc.timestamp.TimestampsRegionImpl; +import org.hibernate.test.cache.jbc.AbstractGeneralDataRegionTestCase; import org.jboss.cache.Cache; import org.jboss.cache.Fqn; Copied: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc (from rev 17020, core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc2) Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc/BatchModeTransactionManagerLookup.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java 2009-07-07 16:38:30 UTC (rev 17020) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/tm/jbc/BatchModeTransactionManagerLookup.java 2009-07-07 17:36:04 UTC (rev 17023) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.tm.jbc2; +package org.hibernate.test.tm.jbc; import java.util.Properties;

14 years, 10 months

1
0
0 / 0

Hibernate SVN: r17022 - in core/trunk: cache-jbosscache and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2009-07-07 13:03:23 -0400 (Tue, 07 Jul 2009) New Revision: 17022 Modified: core/trunk/cache-jbosscache/pom.xml core/trunk/pom.xml Log: HHH-3585 - Upgrade to JBoss Cache 3 Modified: core/trunk/cache-jbosscache/pom.xml =================================================================== --- core/trunk/cache-jbosscache/pom.xml 2009-07-07 16:46:18 UTC (rev 17021) +++ core/trunk/cache-jbosscache/pom.xml 2009-07-07 17:03:23 UTC (rev 17022) @@ -1,3 +1,24 @@ + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -10,11 +31,11 @@ </parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-jbosscache2</artifactId> + <artifactId>hibernate-jbosscache</artifactId> <packaging>jar</packaging> - <name>Hibernate JBossCache3.x Integration</name> - <description>Integration of Hibernate with JBossCache 3 (based on JBossCache2.x+ APIs)</description> + <name>Hibernate JBossCache Integration</name> + <description>Integration of Hibernate with JBossCache 3.x (though 2.x sould work as well)</description> <dependencies> <dependency> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-07-07 16:46:18 UTC (rev 17021) +++ core/trunk/pom.xml 2009-07-07 17:03:23 UTC (rev 17022) @@ -49,7 +49,6 @@ <module>core</module> <module>cache-ehcache</module> <module>cache-jbosscache</module> - <module>cache-jbosscache2</module> <module>cache-oscache</module> <module>cache-swarmcache</module> <module>connection-c3p0</module>

14 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits July 2009