hibernate-commits October 2008

hibernate-commits@lists.jboss.org

2 participants
241 discussions

Hibernate SVN: r15437 - search/trunk/src/java/org/hibernate/search/backend.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2008-10-29 12:51:52 -0400 (Wed, 29 Oct 2008) New Revision: 15437 Modified: search/trunk/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java search/trunk/src/java/org/hibernate/search/backend/TransactionContext.java Log: Javadoc changes Modified: search/trunk/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java =================================================================== --- search/trunk/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java 2008-10-29 16:34:25 UTC (rev 15436) +++ search/trunk/src/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java 2008-10-29 16:51:52 UTC (rev 15437) @@ -7,9 +7,8 @@ import org.hibernate.search.engine.SearchFactoryImplementor; /** - * Build stateful backend processor - * Must have a no arg constructor - * The factory typically prepare or pool the resources needed by the queue processor + * Interface for different types of queue processor factories. Implementations need a no-arg constructor. + * The factory typically prepares or pools the resources needed by the queue processor. * * @author Emmanuel Bernard */ @@ -17,8 +16,10 @@ void initialize(Properties props, SearchFactoryImplementor searchFactory); /** - * Return a runnable implementation responsible for processing the queue to a given backend + * Return a runnable implementation responsible for processing the queue to a given backend. + * + * @param queue The work queue to process. + * @return <code>Runnable</code> which processes <code>queue</code> when started. */ - Runnable getProcessor(List<LuceneWork> queue); } Modified: search/trunk/src/java/org/hibernate/search/backend/TransactionContext.java =================================================================== --- search/trunk/src/java/org/hibernate/search/backend/TransactionContext.java 2008-10-29 16:34:25 UTC (rev 15436) +++ search/trunk/src/java/org/hibernate/search/backend/TransactionContext.java 2008-10-29 16:51:52 UTC (rev 15437) @@ -4,13 +4,13 @@ import javax.transaction.Synchronization; /** - * Contract needed by Hibernate Search to bach changes per transactio + * Contract needed by Hibernate Search to batch changes per transaction. * * @author Navin Surtani - navin(a)surtani.org */ public interface TransactionContext { /** - * @return A boolean whether a transaction is in progress or not. + * @return A boolean indicating whether a transaction is in progress or not. */ public boolean isTransactionInProgress(); @@ -20,7 +20,7 @@ public Object getTransactionIdentifier(); /** - * register the givne synchronization + * Register the given synchronization. * * @param synchronization synchronization to register */

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15436 - in core/trunk/envers/src: test/java/org/hibernate/envers and 49 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-29 12:34:25 -0400 (Wed, 29 Oct 2008) New Revision: 15436 Added: core/trunk/envers/src/test/java/org/hibernate/envers/test/ Removed: core/trunk/envers/src/test/java/org/hibernate/envers/envers/ Modified: core/trunk/envers/src/main/java/org/hibernate/tool/ant/EnversHibernateToolTask.java core/trunk/envers/src/test/java/org/hibernate/envers/test/AbstractEntityTest.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/IntTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/StrIntTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/UnversionedEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/UnversionedStrTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumSetEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/StringListEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/StringSetEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/components/Component1.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/components/Component2.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/Component.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/CompositeCustomTypeEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/CompositeTestUserType.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedTestUserType.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbId.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/MulId.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/MulIdTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwnedEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwningEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwnedEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwnedEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwningEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ListUniEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/SetUniEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefEdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefEdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefEdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListRefCollEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetRefCollEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity1.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity2.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity3.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity4.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/NotVersioned.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/NullProperties.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/cache/QueryCache.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/StringList.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMap.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/StringSet.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/customtype/CompositeCustom.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Dates.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Enums.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/SerObject.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Serializables.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlush.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildVersioning.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentVersioning.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ChildIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ParentIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ReferencedEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicList.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniSet.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/BasicNaming.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/DetachedNamingTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNaming.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefEdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity1.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/OneToManyUnidirectionalNaming.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableNaming.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/EmbIdNaming.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/MulIdNaming.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertable.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertableTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicCollection.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithEmbId.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithMulId.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithNullsDelete.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BidirectionalMapKey.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefEdMapKeyEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefIngMapKeyEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedList.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSet.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleDetachedSet.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional2.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/Unidirectional.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/PropertiesTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/AggregateQuery.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/Custom.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxed.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxedRevEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomPropertyAccess.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/Inherited.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/Listener.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/ListenerRevEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumber.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumberRevEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestRevisionListener.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/revfordate/RevisionForDate.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity1.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity2.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIds.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/SecondaryNamingTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/SecondaryTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/superclass/MappedSubclassing.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/superclass/SubclassEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/superclass/SuperclassOfEntity.java core/trunk/envers/src/test/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java core/trunk/envers/src/test/java/org/hibernate/envers/test/performance/InsertsPerformance.java core/trunk/envers/src/test/java/org/hibernate/envers/test/performance/UpdatesPerformance.java core/trunk/envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java core/trunk/envers/src/test/java/org/hibernate/envers/test/various/Address.java core/trunk/envers/src/test/java/org/hibernate/envers/test/various/HsqlTest.java core/trunk/envers/src/test/java/org/hibernate/envers/test/various/Person.java core/trunk/envers/src/test/resources/hibernate.test.cfg.xml core/trunk/envers/src/test/resources/testng.xml Log: HHH-3550 : import annotations into core Modified: core/trunk/envers/src/main/java/org/hibernate/tool/ant/EnversHibernateToolTask.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/tool/ant/EnversHibernateToolTask.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/main/java/org/hibernate/tool/ant/EnversHibernateToolTask.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -24,9 +24,9 @@ package org.hibernate.tool.ant; import org.apache.tools.ant.BuildException; -import org.jboss.envers.ant.AnnotationConfigurationTaskWithEnvers; -import org.jboss.envers.ant.ConfigurationTaskWithEnvers; -import org.jboss.envers.ant.JPAConfigurationTaskWithEnvers; +import org.hibernate.envers.ant.AnnotationConfigurationTaskWithEnvers; +import org.hibernate.envers.ant.ConfigurationTaskWithEnvers; +import org.hibernate.envers.ant.JPAConfigurationTaskWithEnvers; /** * @author Adam Warski (adam at warski dot org) Copied: core/trunk/envers/src/test/java/org/hibernate/envers/test (from rev 15435, core/trunk/envers/src/test/java/org/hibernate/envers/envers/test) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/AbstractEntityTest.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/AbstractEntityTest.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/AbstractEntityTest.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test; +package org.hibernate.envers.test; import java.io.IOException; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import org.jboss.envers.VersionsReader; -import org.jboss.envers.VersionsReaderFactory; +import org.hibernate.envers.VersionsReader; +import org.hibernate.envers.VersionsReaderFactory; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/IntTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/IntTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/IntTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities; +package org.hibernate.envers.test.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/StrIntTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/StrIntTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/StrIntTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities; +package org.hibernate.envers.test.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/StrTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities; +package org.hibernate.envers.test.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/UnversionedEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/UnversionedEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/UnversionedEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities; +package org.hibernate.envers.test.entities; import javax.persistence.Basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Unversioned; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Unversioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/UnversionedStrTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/UnversionedStrTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/UnversionedStrTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities; +package org.hibernate.envers.test.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumSetEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/collection/EnumSetEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumSetEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.collection; +package org.hibernate.envers.test.entities.collection; import java.util.HashSet; import java.util.Set; @@ -31,7 +31,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; import org.hibernate.annotations.CollectionOfElements; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/StringListEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/collection/StringListEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/StringListEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.collection; +package org.hibernate.envers.test.entities.collection; import java.util.ArrayList; import java.util.List; @@ -29,7 +29,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; import org.hibernate.annotations.CollectionOfElements; import org.hibernate.annotations.IndexColumn; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/collection/StringMapEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.collection; +package org.hibernate.envers.test.entities.collection; import java.util.HashMap; import java.util.Map; @@ -29,7 +29,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; import org.hibernate.annotations.CollectionOfElements; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/StringSetEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/collection/StringSetEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/collection/StringSetEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.collection; +package org.hibernate.envers.test.entities.collection; import java.util.HashSet; import java.util.Set; @@ -29,7 +29,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; import org.hibernate.annotations.CollectionOfElements; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/components/Component1.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/components/Component1.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/components/Component1.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.components; +package org.hibernate.envers.test.entities.components; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/components/Component2.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/components/Component2.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/components/Component2.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.components; +package org.hibernate.envers.test.entities.components; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/components/ComponentTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.components; +package org.hibernate.envers.test.entities.components; import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/Component.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/customtype/Component.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/Component.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.customtype; +package org.hibernate.envers.test.entities.customtype; import java.io.Serializable; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/CompositeCustomTypeEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/customtype/CompositeCustomTypeEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/CompositeCustomTypeEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.customtype; +package org.hibernate.envers.test.entities.customtype; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; import org.hibernate.annotations.Columns; import org.hibernate.annotations.Type; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/CompositeTestUserType.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/customtype/CompositeTestUserType.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/CompositeTestUserType.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.customtype; +package org.hibernate.envers.test.entities.customtype; import java.io.Serializable; import java.sql.PreparedStatement; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.customtype; +package org.hibernate.envers.test.entities.customtype; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedTestUserType.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/customtype/ParametrizedTestUserType.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedTestUserType.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.customtype; +package org.hibernate.envers.test.entities.customtype; import java.io.Serializable; import java.sql.PreparedStatement; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbId.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/ids/EmbId.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbId.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.ids; +package org.hibernate.envers.test.entities.ids; import java.io.Serializable; import javax.persistence.Embeddable; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/ids/EmbIdTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.ids; +package org.hibernate.envers.test.entities.ids; import javax.persistence.EmbeddedId; import javax.persistence.Entity; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/MulId.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/ids/MulId.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/MulId.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.ids; +package org.hibernate.envers.test.entities.ids; import java.io.Serializable; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/MulIdTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/ids/MulIdTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/MulIdTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.ids; +package org.hibernate.envers.test.entities.ids; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.IdClass; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwnedEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/manytomany/ListOwnedEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwnedEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.manytomany; +package org.hibernate.envers.test.entities.manytomany; import java.util.List; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * Many-to-many not-owning entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwningEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/manytomany/ListOwningEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwningEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.manytomany; +package org.hibernate.envers.test.entities.manytomany; import java.util.List; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * Entity owning the many-to-many relation Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwnedEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/manytomany/MapOwnedEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwnedEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.manytomany; +package org.hibernate.envers.test.entities.manytomany; import java.util.Set; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * Many-to-many not-owning entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/manytomany/MapOwningEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.manytomany; +package org.hibernate.envers.test.entities.manytomany; import java.util.HashMap; import java.util.Map; @@ -29,7 +29,7 @@ import javax.persistence.Id; import javax.persistence.ManyToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * Entity owning the many-to-many relation Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwnedEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/manytomany/SetOwnedEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwnedEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.manytomany; +package org.hibernate.envers.test.entities.manytomany; import java.util.Set; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * Many-to-many not-owning entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwningEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/manytomany/SetOwningEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwningEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.manytomany; +package org.hibernate.envers.test.entities.manytomany; import java.util.Set; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * Entity owning the many-to-many relation Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ListUniEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/manytomany/unidirectional/ListUniEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ListUniEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.manytomany.unidirectional; +package org.hibernate.envers.test.entities.manytomany.unidirectional; import java.util.List; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.StrTestEntity; /** * Entity owning the many-to-many relation Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/manytomany/unidirectional/MapUniEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.manytomany.unidirectional; +package org.hibernate.envers.test.entities.manytomany.unidirectional; import java.util.Map; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.StrTestEntity; /** * Entity with a map from a string to an entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/SetUniEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/manytomany/unidirectional/SetUniEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/SetUniEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.manytomany.unidirectional; +package org.hibernate.envers.test.entities.manytomany.unidirectional; import java.util.Set; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.StrTestEntity; /** * Entity owning the many-to-many relation Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefEdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/CollectionRefEdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefEdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany; +package org.hibernate.envers.test.entities.onetomany; import java.util.Collection; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencEd entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/CollectionRefIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany; +package org.hibernate.envers.test.entities.onetomany; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencIng entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefEdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/ListRefEdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefEdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany; +package org.hibernate.envers.test.entities.onetomany; import java.util.List; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencEd entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/ListRefIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany; +package org.hibernate.envers.test.entities.onetomany; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencIng entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefEdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/SetRefEdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefEdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany; +package org.hibernate.envers.test.entities.onetomany; import java.util.Set; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencEd entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/SetRefIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany; +package org.hibernate.envers.test.entities.onetomany; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencIng entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany.detached; +package org.hibernate.envers.test.entities.onetomany.detached; import java.util.Set; import javax.persistence.Entity; @@ -29,8 +29,8 @@ import javax.persistence.JoinTable; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.StrTestEntity; /** * Set collection of references entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListRefCollEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/detached/ListRefCollEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListRefCollEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany.detached; +package org.hibernate.envers.test.entities.onetomany.detached; import java.util.List; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.StrTestEntity; /** * Set collection of references entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany.detached; +package org.hibernate.envers.test.entities.onetomany.detached; import java.util.Set; import javax.persistence.Entity; @@ -29,8 +29,8 @@ import javax.persistence.JoinColumn; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.StrTestEntity; /** * A detached relation to another entity, with a @OneToMany+@JoinColumn mapping. Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetRefCollEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/detached/SetRefCollEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetRefCollEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany.detached; +package org.hibernate.envers.test.entities.onetomany.detached; import java.util.Set; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.StrTestEntity; /** * Set collection of references entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany.detached.ids; +package org.hibernate.envers.test.entities.onetomany.detached.ids; import java.util.Set; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.EmbId; -import org.jboss.envers.test.entities.ids.EmbIdTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.envers.test.entities.ids.EmbIdTestEntity; /** * Set collection of references entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany.detached.ids; +package org.hibernate.envers.test.entities.onetomany.detached.ids; import java.util.Set; import javax.persistence.Entity; @@ -29,9 +29,9 @@ import javax.persistence.IdClass; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.MulId; -import org.jboss.envers.test.entities.ids.MulIdTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.envers.test.entities.ids.MulIdTestEntity; /** * Set collection of references entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany.ids; +package org.hibernate.envers.test.entities.onetomany.ids; import java.util.Set; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.EmbId; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.EmbId; /** * ReferencEd entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany.ids; +package org.hibernate.envers.test.entities.onetomany.ids; import java.util.Set; import javax.persistence.Entity; @@ -29,8 +29,8 @@ import javax.persistence.IdClass; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.MulId; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.MulId; /** * ReferencEd entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany.ids; +package org.hibernate.envers.test.entities.onetomany.ids; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.EmbId; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.EmbId; /** * ReferencIng entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.onetomany.ids; +package org.hibernate.envers.test.entities.onetomany.ids; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.IdClass; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.MulId; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.MulId; /** * ReferencIng entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.reventity; +package org.hibernate.envers.test.entities.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.RevisionEntity; -import org.jboss.envers.RevisionNumber; -import org.jboss.envers.RevisionTimestamp; +import org.hibernate.envers.RevisionEntity; +import org.hibernate.envers.RevisionNumber; +import org.hibernate.envers.RevisionTimestamp; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/entities/reventity/CustomRevEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.entities.reventity; +package org.hibernate.envers.test.entities.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.RevisionEntity; -import org.jboss.envers.RevisionNumber; -import org.jboss.envers.RevisionTimestamp; +import org.hibernate.envers.RevisionEntity; +import org.hibernate.envers.RevisionNumber; +import org.hibernate.envers.RevisionTimestamp; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity1.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/BasicTestEntity1.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity1.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity2.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/BasicTestEntity2.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity2.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity3.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/BasicTestEntity3.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity3.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity4.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/BasicTestEntity4.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity4.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/Delete.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/GlobalVersioned.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/ManyOperationsInTransaction.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/NotVersioned.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/NotVersioned.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/NotVersioned.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import javax.persistence.EntityManager; -import org.jboss.envers.exception.NotVersionedException; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.exception.NotVersionedException; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/NullProperties.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/NullProperties.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/NullProperties.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/Simple.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.IntTestEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.IntTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/SingleOperationInTransaction.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.exception.RevisionDoesNotExistException; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.exception.RevisionDoesNotExistException; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/UnversionedPropertiesChange.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/basic/UnversionedProperty.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.basic; +package org.hibernate.envers.test.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.UnversionedEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.UnversionedEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/cache/OneToManyCache.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.cache; +package org.hibernate.envers.test.integration.cache; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.onetomany.SetRefEdEntity; -import org.jboss.envers.test.entities.onetomany.SetRefIngEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; +import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/cache/OneToOneCache.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.cache; +package org.hibernate.envers.test.integration.cache; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.integration.onetoone.bidirectional.BiRefEdEntity; -import org.jboss.envers.test.integration.onetoone.bidirectional.BiRefIngEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefEdEntity; +import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefIngEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/cache/QueryCache.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/cache/QueryCache.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/cache/QueryCache.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.cache; +package org.hibernate.envers.test.integration.cache; import java.util.List; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.IntTestEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.IntTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/collection/EnumSet.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.collection; +package org.hibernate.envers.test.integration.collection; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.collection.EnumSetEntity; -import static org.jboss.envers.test.entities.collection.EnumSetEntity.E1; -import static org.jboss.envers.test.entities.collection.EnumSetEntity.E2; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.collection.EnumSetEntity; +import static org.hibernate.envers.test.entities.collection.EnumSetEntity.E1; +import static org.hibernate.envers.test.entities.collection.EnumSetEntity.E2; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/StringList.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/collection/StringList.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/StringList.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.collection; +package org.hibernate.envers.test.integration.collection; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.collection.StringListEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.collection.StringListEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMap.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/collection/StringMap.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMap.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.collection; +package org.hibernate.envers.test.integration.collection; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.collection.StringMapEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.collection.StringMapEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/StringSet.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/collection/StringSet.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/StringSet.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.collection; +package org.hibernate.envers.test.integration.collection; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.collection.StringSetEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.collection.StringSetEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/collection/mapkey/ComponentMapKey.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.collection.mapkey; +package org.hibernate.envers.test.integration.collection.mapkey; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.components.Component1; -import org.jboss.envers.test.entities.components.Component2; -import org.jboss.envers.test.entities.components.ComponentTestEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.components.Component1; +import org.hibernate.envers.test.entities.components.Component2; +import org.hibernate.envers.test.entities.components.ComponentTestEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.collection.mapkey; +package org.hibernate.envers.test.integration.collection.mapkey; import java.util.HashMap; import java.util.Map; @@ -31,9 +31,9 @@ import javax.persistence.ManyToMany; import javax.persistence.MapKey; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.components.Component1; -import org.jboss.envers.test.entities.components.ComponentTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.components.Component1; +import org.hibernate.envers.test.entities.components.ComponentTestEntity; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/collection/mapkey/IdMapKey.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.collection.mapkey; +package org.hibernate.envers.test.integration.collection.mapkey; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/collection/mapkey/IdMapKeyEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.collection.mapkey; +package org.hibernate.envers.test.integration.collection.mapkey; import java.util.HashMap; import java.util.Map; @@ -31,8 +31,8 @@ import javax.persistence.ManyToMany; import javax.persistence.MapKey; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.StrTestEntity; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/components/Components.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.components; +package org.hibernate.envers.test.integration.components; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.components.Component1; -import org.jboss.envers.test.entities.components.Component2; -import org.jboss.envers.test.entities.components.ComponentTestEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.components.Component1; +import org.hibernate.envers.test.entities.components.Component2; +import org.hibernate.envers.test.entities.components.ComponentTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/customtype/CompositeCustom.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/customtype/CompositeCustom.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/customtype/CompositeCustom.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.customtype; +package org.hibernate.envers.test.integration.customtype; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.customtype.Component; -import org.jboss.envers.test.entities.customtype.CompositeCustomTypeEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.customtype.Component; +import org.hibernate.envers.test.entities.customtype.CompositeCustomTypeEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/customtype/ParametrizedCustom.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.customtype; +package org.hibernate.envers.test.integration.customtype; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.customtype.ParametrizedCustomTypeEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.customtype.ParametrizedCustomTypeEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/data/DateTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.data; +package org.hibernate.envers.test.integration.data; import java.util.Date; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Dates.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/data/Dates.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Dates.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.data; +package org.hibernate.envers.test.integration.data; import java.util.Arrays; import java.util.Date; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/data/EnumTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.data; +package org.hibernate.envers.test.integration.data; import javax.persistence.Entity; import javax.persistence.EnumType; @@ -29,7 +29,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Enums.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/data/Enums.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Enums.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.data; +package org.hibernate.envers.test.integration.data; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/data/LobTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.data; +package org.hibernate.envers.test.integration.data; import java.util.Arrays; import javax.persistence.Entity; @@ -29,7 +29,7 @@ import javax.persistence.Id; import javax.persistence.Lob; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/data/Lobs.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.data; +package org.hibernate.envers.test.integration.data; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/SerObject.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/data/SerObject.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/SerObject.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.data; +package org.hibernate.envers.test.integration.data; import java.io.Serializable; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/data/SerializableTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.data; +package org.hibernate.envers.test.integration.data; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Serializables.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/data/Serializables.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/data/Serializables.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.data; +package org.hibernate.envers.test.integration.data; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/flush/AbstractFlushTest.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.flush; +package org.hibernate.envers.test.integration.flush; import java.io.IOException; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.hibernate.FlushMode; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/flush/DoubleFlushAddDel.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.flush; +package org.hibernate.envers.test.integration.flush; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/flush/DoubleFlushAddMod.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.flush; +package org.hibernate.envers.test.integration.flush; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/flush/DoubleFlushModDel.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.flush; +package org.hibernate.envers.test.integration.flush; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/flush/DoubleFlushModMod.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.flush; +package org.hibernate.envers.test.integration.flush; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlush.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/flush/ManualFlush.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlush.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.flush; +package org.hibernate.envers.test.integration.flush; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/ids/CompositeIds.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.ids; +package org.hibernate.envers.test.integration.ids; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.EmbId; -import org.jboss.envers.test.entities.ids.EmbIdTestEntity; -import org.jboss.envers.test.entities.ids.MulId; -import org.jboss.envers.test.entities.ids.MulIdTestEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.envers.test.entities.ids.EmbIdTestEntity; +import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.envers.test.entities.ids.MulIdTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/ChildEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single; +package org.hibernate.envers.test.integration.inheritance.single; import javax.persistence.Basic; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildVersioning.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/ChildVersioning.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildVersioning.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single; +package org.hibernate.envers.test.integration.inheritance.single; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/ParentEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single; +package org.hibernate.envers.test.integration.inheritance.single; import javax.persistence.Basic; import javax.persistence.DiscriminatorColumn; @@ -33,7 +33,7 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentVersioning.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/ParentVersioning.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentVersioning.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single; +package org.hibernate.envers.test.integration.inheritance.single; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single.childrelation; +package org.hibernate.envers.test.integration.inheritance.single.childrelation; import javax.persistence.Basic; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single.childrelation; +package org.hibernate.envers.test.integration.inheritance.single.childrelation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single.childrelation; +package org.hibernate.envers.test.integration.inheritance.single.childrelation; import javax.persistence.Basic; import javax.persistence.DiscriminatorColumn; @@ -33,7 +33,7 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single.childrelation; +package org.hibernate.envers.test.integration.inheritance.single.childrelation; import java.util.Set; import javax.persistence.Entity; @@ -29,7 +29,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ChildIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/relation/ChildIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ChildIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single.relation; +package org.hibernate.envers.test.integration.inheritance.single.relation; import javax.persistence.Basic; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ParentIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/relation/ParentIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ParentIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single.relation; +package org.hibernate.envers.test.integration.inheritance.single.relation; import javax.persistence.Basic; import javax.persistence.DiscriminatorColumn; @@ -34,7 +34,7 @@ import javax.persistence.InheritanceType; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single.relation; +package org.hibernate.envers.test.integration.inheritance.single.relation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ReferencedEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/inheritance/single/relation/ReferencedEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ReferencedEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.inheritance.single.relation; +package org.hibernate.envers.test.integration.inheritance.single.relation; import java.util.Set; import javax.persistence.Entity; @@ -29,7 +29,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicList.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/manytomany/BasicList.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicList.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.manytomany; +package org.hibernate.envers.test.integration.manytomany; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.manytomany.ListOwnedEntity; -import org.jboss.envers.test.entities.manytomany.ListOwningEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.manytomany.ListOwnedEntity; +import org.hibernate.envers.test.entities.manytomany.ListOwningEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/manytomany/BasicMap.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.manytomany; +package org.hibernate.envers.test.integration.manytomany; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.manytomany.MapOwnedEntity; -import org.jboss.envers.test.entities.manytomany.MapOwningEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.manytomany.MapOwnedEntity; +import org.hibernate.envers.test.entities.manytomany.MapOwningEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/manytomany/BasicSet.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.manytomany; +package org.hibernate.envers.test.integration.manytomany; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.manytomany.SetOwnedEntity; -import org.jboss.envers.test.entities.manytomany.SetOwningEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.manytomany.SetOwnedEntity; +import org.hibernate.envers.test.entities.manytomany.SetOwningEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/manytomany/ternary/TernaryMap.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.manytomany.ternary; +package org.hibernate.envers.test.integration.manytomany.ternary; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.IntTestEntity; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.IntTestEntity; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/manytomany/ternary/TernaryMapEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.manytomany.ternary; +package org.hibernate.envers.test.integration.manytomany.ternary; import java.util.HashMap; import java.util.Map; @@ -30,9 +30,9 @@ import javax.persistence.Id; import javax.persistence.ManyToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.IntTestEntity; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.IntTestEntity; +import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.annotations.MapKeyManyToMany; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/manytomany/unidirectional/BasicUniList.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.manytomany.unidirectional; +package org.hibernate.envers.test.integration.manytomany.unidirectional; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.manytomany.unidirectional.ListUniEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.manytomany.unidirectional.ListUniEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/manytomany/unidirectional/BasicUniMap.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.manytomany.unidirectional; +package org.hibernate.envers.test.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.HashMap; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.manytomany.unidirectional.MapUniEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.manytomany.unidirectional.MapUniEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniSet.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/manytomany/unidirectional/BasicUniSet.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniSet.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.manytomany.unidirectional; +package org.hibernate.envers.test.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.manytomany.unidirectional.SetUniEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.manytomany.unidirectional.SetUniEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/BasicNaming.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/BasicNaming.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/BasicNaming.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming; +package org.hibernate.envers.test.integration.naming; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -109,7 +109,7 @@ @Test public void testTableName() { assert "naming_test_entity_1_versions".equals( - getCfg().getClassMapping("org.jboss.envers.test.integration.naming.NamingTestEntity1_versions") + getCfg().getClassMapping("org.hibernate.envers.test.integration.naming.NamingTestEntity1_versions") .getTable().getName()); } } Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/DetachedNamingTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/DetachedNamingTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/DetachedNamingTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming; +package org.hibernate.envers.test.integration.naming; import java.util.Set; import javax.persistence.Entity; @@ -30,8 +30,8 @@ import javax.persistence.JoinTable; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.StrTestEntity; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNaming.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/JoinNaming.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNaming.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming; +package org.hibernate.envers.test.integration.naming; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -123,7 +123,7 @@ @Test public void testJoinColumnName() { Iterator<Column> columns = - getCfg().getClassMapping("org.jboss.envers.test.integration.naming.JoinNamingRefIngEntity_versions") + getCfg().getClassMapping("org.hibernate.envers.test.integration.naming.JoinNamingRefIngEntity_versions") .getProperty("reference").getColumnIterator(); while (columns.hasNext()) { Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefEdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/JoinNamingRefEdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefEdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming; +package org.hibernate.envers.test.integration.naming; import java.util.List; import javax.persistence.Column; @@ -30,7 +30,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencEd entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/JoinNamingRefIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming; +package org.hibernate.envers.test.integration.naming; import javax.persistence.Column; import javax.persistence.Entity; @@ -30,7 +30,7 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencIng entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity1.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/NamingTestEntity1.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity1.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming; +package org.hibernate.envers.test.integration.naming; import javax.persistence.Column; import javax.persistence.Entity; @@ -29,8 +29,8 @@ import javax.persistence.Id; import javax.persistence.Table; -import org.jboss.envers.Versioned; -import org.jboss.envers.VersionsTable; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.VersionsTable; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/OneToManyUnidirectionalNaming.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/OneToManyUnidirectionalNaming.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/OneToManyUnidirectionalNaming.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming; +package org.hibernate.envers.test.integration.naming; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableNaming.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/VersionsJoinTableNaming.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableNaming.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming; +package org.hibernate.envers.test.integration.naming; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/VersionsJoinTableTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming; +package org.hibernate.envers.test.integration.naming; import java.util.Set; import javax.persistence.Entity; @@ -29,9 +29,9 @@ import javax.persistence.JoinColumn; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; -import org.jboss.envers.VersionsJoinTable; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.VersionsJoinTable; +import org.hibernate.envers.test.entities.StrTestEntity; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/EmbIdNaming.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/ids/EmbIdNaming.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/EmbIdNaming.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming.ids; +package org.hibernate.envers.test.integration.naming.ids; import java.io.Serializable; import javax.persistence.Column; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/ids/JoinEmbIdNaming.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming.ids; +package org.hibernate.envers.test.integration.naming.ids; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -121,7 +121,7 @@ @Test public void testJoinColumnNames() { Iterator<Column> columns = - getCfg().getClassMapping("org.jboss.envers.test.integration.naming.ids.JoinEmbIdNamingRefIngEntity_versions") + getCfg().getClassMapping("org.hibernate.envers.test.integration.naming.ids.JoinEmbIdNamingRefIngEntity_versions") .getProperty("reference").getColumnIterator(); boolean xxFound = false; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming.ids; +package org.hibernate.envers.test.integration.naming.ids; import java.util.List; import javax.persistence.Entity; @@ -29,7 +29,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencEd entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming.ids; +package org.hibernate.envers.test.integration.naming.ids; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -30,7 +30,7 @@ import javax.persistence.JoinColumns; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencIng entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/ids/JoinMulIdNaming.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming.ids; +package org.hibernate.envers.test.integration.naming.ids; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -121,7 +121,7 @@ @Test public void testJoinColumnNames() { Iterator<Column> columns = - getCfg().getClassMapping("org.jboss.envers.test.integration.naming.ids.JoinMulIdNamingRefIngEntity_versions") + getCfg().getClassMapping("org.hibernate.envers.test.integration.naming.ids.JoinMulIdNamingRefIngEntity_versions") .getProperty("reference").getColumnIterator(); boolean id1Found = false; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming.ids; +package org.hibernate.envers.test.integration.naming.ids; import java.util.List; import javax.persistence.Entity; @@ -29,7 +29,7 @@ import javax.persistence.IdClass; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencEd entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming.ids; +package org.hibernate.envers.test.integration.naming.ids; import javax.persistence.Entity; import javax.persistence.Id; @@ -30,7 +30,7 @@ import javax.persistence.JoinColumns; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * ReferencIng entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/MulIdNaming.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/naming/ids/MulIdNaming.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/MulIdNaming.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.naming.ids; +package org.hibernate.envers.test.integration.naming.ids; import java.io.Serializable; import javax.persistence.Column; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertable.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/notinsertable/NotInsertable.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertable.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.notinsertable; +package org.hibernate.envers.test.integration.notinsertable; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertableTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/notinsertable/NotInsertableTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertableTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.notinsertable; +package org.hibernate.envers.test.integration.notinsertable; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicCollection.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/BasicCollection.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicCollection.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany; +package org.hibernate.envers.test.integration.onetomany; import java.util.Arrays; import java.util.Collections; @@ -29,9 +29,9 @@ import java.util.Set; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.onetomany.CollectionRefEdEntity; -import org.jboss.envers.test.entities.onetomany.CollectionRefIngEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.onetomany.CollectionRefEdEntity; +import org.hibernate.envers.test.entities.onetomany.CollectionRefIngEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/BasicList.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany; +package org.hibernate.envers.test.integration.onetomany; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.onetomany.ListRefEdEntity; -import org.jboss.envers.test.entities.onetomany.ListRefIngEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.onetomany.ListRefEdEntity; +import org.hibernate.envers.test.entities.onetomany.ListRefIngEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/BasicSet.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany; +package org.hibernate.envers.test.integration.onetomany; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.onetomany.SetRefEdEntity; -import org.jboss.envers.test.entities.onetomany.SetRefIngEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; +import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithEmbId.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/BasicSetWithEmbId.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithEmbId.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany; +package org.hibernate.envers.test.integration.onetomany; import java.util.Arrays; import java.util.Collections; @@ -29,10 +29,10 @@ import java.util.Set; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.EmbId; -import org.jboss.envers.test.entities.onetomany.ids.SetRefEdEmbIdEntity; -import org.jboss.envers.test.entities.onetomany.ids.SetRefIngEmbIdEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.envers.test.entities.onetomany.ids.SetRefEdEmbIdEntity; +import org.hibernate.envers.test.entities.onetomany.ids.SetRefIngEmbIdEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithMulId.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/BasicSetWithMulId.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithMulId.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany; +package org.hibernate.envers.test.integration.onetomany; import java.util.Arrays; import java.util.Collections; @@ -29,10 +29,10 @@ import java.util.Set; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.MulId; -import org.jboss.envers.test.entities.onetomany.ids.SetRefEdMulIdEntity; -import org.jboss.envers.test.entities.onetomany.ids.SetRefIngMulIdEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.envers.test.entities.onetomany.ids.SetRefEdMulIdEntity; +import org.hibernate.envers.test.entities.onetomany.ids.SetRefIngMulIdEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithNullsDelete.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/BasicSetWithNullsDelete.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithNullsDelete.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany; +package org.hibernate.envers.test.integration.onetomany; import java.util.Arrays; import java.util.Collections; @@ -29,9 +29,9 @@ import java.util.Set; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.onetomany.SetRefEdEntity; -import org.jboss.envers.test.entities.onetomany.SetRefIngEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; +import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BidirectionalMapKey.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/BidirectionalMapKey.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BidirectionalMapKey.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany; +package org.hibernate.envers.test.integration.onetomany; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefEdMapKeyEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/RefEdMapKeyEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefEdMapKeyEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany; +package org.hibernate.envers.test.integration.onetomany; import java.util.HashMap; import java.util.Map; @@ -31,7 +31,7 @@ import javax.persistence.MapKey; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefIngMapKeyEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/RefIngMapKeyEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefIngMapKeyEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany; +package org.hibernate.envers.test.integration.onetomany; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedList.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/detached/BasicDetachedList.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedList.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany.detached; +package org.hibernate.envers.test.integration.onetomany.detached; import java.util.ArrayList; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.onetomany.detached.ListRefCollEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.onetomany.detached.ListRefCollEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSet.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/detached/BasicDetachedSet.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSet.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany.detached; +package org.hibernate.envers.test.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.onetomany.detached.SetRefCollEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.onetomany.detached.SetRefCollEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany.detached; +package org.hibernate.envers.test.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.EmbId; -import org.jboss.envers.test.entities.ids.EmbIdTestEntity; -import org.jboss.envers.test.entities.onetomany.detached.ids.SetRefCollEntityEmbId; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.envers.test.entities.ids.EmbIdTestEntity; +import org.hibernate.envers.test.entities.onetomany.detached.ids.SetRefCollEntityEmbId; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany.detached; +package org.hibernate.envers.test.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.MulId; -import org.jboss.envers.test.entities.ids.MulIdTestEntity; -import org.jboss.envers.test.entities.onetomany.detached.ids.SetRefCollEntityMulId; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.envers.test.entities.ids.MulIdTestEntity; +import org.hibernate.envers.test.entities.onetomany.detached.ids.SetRefCollEntityMulId; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany.detached; +package org.hibernate.envers.test.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.onetomany.detached.SetJoinColumnRefCollEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.onetomany.detached.SetJoinColumnRefCollEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany.detached; +package org.hibernate.envers.test.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.onetomany.detached.SetRefCollEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.onetomany.detached.SetRefCollEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleDetachedSet.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetomany/detached/DoubleDetachedSet.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleDetachedSet.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetomany.detached; +package org.hibernate.envers.test.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.onetomany.detached.DoubleSetRefCollEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.onetomany.detached.DoubleSetRefCollEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional; +package org.hibernate.envers.test.integration.onetoone.bidirectional; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional; +package org.hibernate.envers.test.integration.onetoone.bidirectional; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/Bidirectional.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional; +package org.hibernate.envers.test.integration.onetoone.bidirectional; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional2.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/Bidirectional2.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional2.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional; +package org.hibernate.envers.test.integration.onetoone.bidirectional; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional; +package org.hibernate.envers.test.integration.onetoone.bidirectional; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.envers.test.integration.onetoone.bidirectional.ids; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.OneToOne; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.EmbId; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.EmbId; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.envers.test.integration.onetoone.bidirectional.ids; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.OneToOne; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.EmbId; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.EmbId; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.envers.test.integration.onetoone.bidirectional.ids; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.IdClass; import javax.persistence.OneToOne; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.MulId; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.MulId; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.envers.test.integration.onetoone.bidirectional.ids; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.IdClass; import javax.persistence.OneToOne; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.MulId; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.MulId; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.envers.test.integration.onetoone.bidirectional.ids; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.EmbId; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.EmbId; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.envers.test.integration.onetoone.bidirectional.ids; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.MulId; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.MulId; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.unidirectional; +package org.hibernate.envers.test.integration.onetoone.unidirectional; import javax.persistence.Entity; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * Unidirectional ReferencEd Entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.unidirectional; +package org.hibernate.envers.test.integration.onetoone.unidirectional; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * Unidirectional ReferencIng Entity Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/Unidirectional.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/unidirectional/Unidirectional.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/Unidirectional.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.unidirectional; +package org.hibernate.envers.test.integration.onetoone.unidirectional; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.onetoone.unidirectional; +package org.hibernate.envers.test.integration.onetoone.unidirectional; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/PropertiesTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/properties/PropertiesTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/PropertiesTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.properties; +package org.hibernate.envers.test.integration.properties; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/properties/UnversionedOptimisticLockingField.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.properties; +package org.hibernate.envers.test.integration.properties; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -44,7 +44,7 @@ public void configure(Ejb3Configuration cfg) { cfg.addAnnotatedClass(UnversionedOptimisticLockingFieldEntity.class); - cfg.setProperty("org.jboss.envers.unversionedOptimisticLockingField", "true"); + cfg.setProperty("org.hibernate.envers.unversionedOptimisticLockingField", "true"); } @BeforeClass(dependsOnMethods = "init") Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.properties; +package org.hibernate.envers.test.integration.properties; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Version; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Nicolas Doroskevich Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/properties/VersionsProperties.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.properties; +package org.hibernate.envers.test.integration.properties; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -41,11 +41,11 @@ public void configure(Ejb3Configuration cfg) { cfg.addAnnotatedClass(PropertiesTestEntity.class); - cfg.setProperty("org.jboss.envers.versionsTablePrefix", "VP_"); - cfg.setProperty("org.jboss.envers.versionsTableSuffix", "_VS"); - cfg.setProperty("org.jboss.envers.idFieldName", "ver_id"); - cfg.setProperty("org.jboss.envers.revisionFieldName", "ver_rev"); - cfg.setProperty("org.jboss.envers.revisionTypeFieldName", "ver_rev_type"); + cfg.setProperty("org.hibernate.envers.versionsTablePrefix", "VP_"); + cfg.setProperty("org.hibernate.envers.versionsTableSuffix", "_VS"); + cfg.setProperty("org.hibernate.envers.idFieldName", "ver_id"); + cfg.setProperty("org.hibernate.envers.revisionFieldName", "ver_rev"); + cfg.setProperty("org.hibernate.envers.revisionTypeFieldName", "ver_rev_type"); } @BeforeClass(dependsOnMethods = "init") Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/AggregateQuery.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/query/AggregateQuery.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/AggregateQuery.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.query; +package org.hibernate.envers.test.integration.query; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.IntTestEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.IntTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/query/CustomRevEntityQuery.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.query; +package org.hibernate.envers.test.integration.query; import java.util.List; import javax.persistence.EntityManager; -import org.jboss.envers.query.VersionsRestrictions; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrIntTestEntity; -import org.jboss.envers.test.entities.reventity.CustomRevEntity; +import org.hibernate.envers.query.VersionsRestrictions; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.envers.test.entities.reventity.CustomRevEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/query/DeletedEntities.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.query; +package org.hibernate.envers.test.integration.query; import java.util.List; import javax.persistence.EntityManager; -import org.jboss.envers.DefaultRevisionEntity; -import org.jboss.envers.RevisionType; -import org.jboss.envers.query.VersionsRestrictions; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrIntTestEntity; +import org.hibernate.envers.DefaultRevisionEntity; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.query.VersionsRestrictions; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrIntTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/query/MaximalizePropertyQuery.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.query; +package org.hibernate.envers.test.integration.query; import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; -import org.jboss.envers.query.RevisionProperty; -import org.jboss.envers.query.VersionsRestrictions; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrIntTestEntity; +import org.hibernate.envers.query.RevisionProperty; +import org.hibernate.envers.query.VersionsRestrictions; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrIntTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/query/OrderByLimitQuery.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.query; +package org.hibernate.envers.test.integration.query; import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.IntTestEntity; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.IntTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/query/RevisionConstraintQuery.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.query; +package org.hibernate.envers.test.integration.query; import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; -import org.jboss.envers.query.RevisionProperty; -import org.jboss.envers.query.VersionsRestrictions; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrIntTestEntity; +import org.hibernate.envers.query.RevisionProperty; +import org.hibernate.envers.query.VersionsRestrictions; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrIntTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/query/SimpleQuery.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,21 +21,21 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.query; +package org.hibernate.envers.test.integration.query; import java.util.Arrays; import java.util.HashSet; import java.util.List; import javax.persistence.EntityManager; -import org.jboss.envers.DefaultRevisionEntity; -import org.jboss.envers.RevisionType; -import org.jboss.envers.query.RevisionProperty; -import org.jboss.envers.query.RevisionTypeProperty; -import org.jboss.envers.query.VersionsRestrictions; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrIntTestEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.DefaultRevisionEntity; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.query.RevisionProperty; +import org.hibernate.envers.query.RevisionTypeProperty; +import org.hibernate.envers.query.VersionsRestrictions; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/query/ids/EmbIdOneToManyQuery.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,19 +21,19 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.query.ids; +package org.hibernate.envers.test.integration.query.ids; import java.util.HashSet; import java.util.List; import java.util.Set; import javax.persistence.EntityManager; -import org.jboss.envers.query.VersionsRestrictions; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.EmbId; -import org.jboss.envers.test.entities.onetomany.ids.SetRefEdEmbIdEntity; -import org.jboss.envers.test.entities.onetomany.ids.SetRefIngEmbIdEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.query.VersionsRestrictions; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.envers.test.entities.onetomany.ids.SetRefEdEmbIdEntity; +import org.hibernate.envers.test.entities.onetomany.ids.SetRefIngEmbIdEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/query/ids/MulIdOneToManyQuery.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,19 +21,19 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.query.ids; +package org.hibernate.envers.test.integration.query.ids; import java.util.HashSet; import java.util.List; import java.util.Set; import javax.persistence.EntityManager; -import org.jboss.envers.query.VersionsRestrictions; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.MulId; -import org.jboss.envers.test.entities.onetomany.ids.SetRefEdMulIdEntity; -import org.jboss.envers.test.entities.onetomany.ids.SetRefIngMulIdEntity; -import org.jboss.envers.test.tools.TestTools; +import org.hibernate.envers.query.VersionsRestrictions; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.envers.test.entities.onetomany.ids.SetRefEdMulIdEntity; +import org.hibernate.envers.test.entities.onetomany.ids.SetRefIngMulIdEntity; +import org.hibernate.envers.test.tools.TestTools; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/Custom.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/Custom.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/Custom.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; import java.util.Arrays; import java.util.Date; import javax.persistence.EntityManager; -import org.jboss.envers.VersionsReader; -import org.jboss.envers.exception.RevisionDoesNotExistException; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.reventity.CustomRevEntity; +import org.hibernate.envers.VersionsReader; +import org.hibernate.envers.exception.RevisionDoesNotExistException; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.reventity.CustomRevEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxed.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/CustomBoxed.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxed.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; import java.util.Arrays; import java.util.Date; import javax.persistence.EntityManager; -import org.jboss.envers.VersionsReader; -import org.jboss.envers.exception.RevisionDoesNotExistException; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.VersionsReader; +import org.hibernate.envers.exception.RevisionDoesNotExistException; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxedRevEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/CustomBoxedRevEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxedRevEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.RevisionEntity; -import org.jboss.envers.RevisionNumber; -import org.jboss.envers.RevisionTimestamp; +import org.hibernate.envers.RevisionEntity; +import org.hibernate.envers.RevisionNumber; +import org.hibernate.envers.RevisionTimestamp; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomPropertyAccess.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/CustomPropertyAccess.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomPropertyAccess.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; import java.util.Arrays; import java.util.Date; import javax.persistence.EntityManager; -import org.jboss.envers.VersionsReader; -import org.jboss.envers.exception.RevisionDoesNotExistException; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.reventity.CustomPropertyAccessRevEntity; +import org.hibernate.envers.VersionsReader; +import org.hibernate.envers.exception.RevisionDoesNotExistException; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.reventity.CustomPropertyAccessRevEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/Inherited.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/Inherited.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/Inherited.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; import java.util.Arrays; import java.util.Date; import javax.persistence.EntityManager; -import org.jboss.envers.VersionsReader; -import org.jboss.envers.exception.RevisionDoesNotExistException; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.VersionsReader; +import org.hibernate.envers.exception.RevisionDoesNotExistException; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/InheritedRevEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; import javax.persistence.Entity; -import org.jboss.envers.DefaultRevisionEntity; -import org.jboss.envers.RevisionEntity; +import org.hibernate.envers.DefaultRevisionEntity; +import org.hibernate.envers.RevisionEntity; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/Listener.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/Listener.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/Listener.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; import java.util.Arrays; import java.util.Date; import javax.persistence.EntityManager; -import org.jboss.envers.VersionsReader; -import org.jboss.envers.exception.RevisionDoesNotExistException; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.VersionsReader; +import org.hibernate.envers.exception.RevisionDoesNotExistException; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/ListenerRevEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/ListenerRevEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/ListenerRevEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.RevisionEntity; -import org.jboss.envers.RevisionNumber; -import org.jboss.envers.RevisionTimestamp; +import org.hibernate.envers.RevisionEntity; +import org.hibernate.envers.RevisionNumber; +import org.hibernate.envers.RevisionTimestamp; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumber.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/LongRevNumber.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumber.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.VersionsReader; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.VersionsReader; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumberRevEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/LongRevNumberRevEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumberRevEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import org.jboss.envers.RevisionEntity; -import org.jboss.envers.RevisionNumber; -import org.jboss.envers.RevisionTimestamp; +import org.hibernate.envers.RevisionEntity; +import org.hibernate.envers.RevisionNumber; +import org.hibernate.envers.RevisionTimestamp; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestRevisionListener.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/reventity/TestRevisionListener.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestRevisionListener.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.reventity; +package org.hibernate.envers.test.integration.reventity; -import org.jboss.envers.RevisionListener; +import org.hibernate.envers.RevisionListener; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/revfordate/RevisionForDate.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/revfordate/RevisionForDate.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/revfordate/RevisionForDate.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.revfordate; +package org.hibernate.envers.test.integration.revfordate; import java.util.Date; import javax.persistence.EntityManager; -import org.jboss.envers.VersionsReader; -import org.jboss.envers.exception.RevisionDoesNotExistException; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.StrTestEntity; +import org.hibernate.envers.VersionsReader; +import org.hibernate.envers.exception.RevisionDoesNotExistException; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.StrTestEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity1.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/sameids/SameIdTestEntity1.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity1.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.sameids; +package org.hibernate.envers.test.integration.sameids; import javax.persistence.Entity; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity2.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/sameids/SameIdTestEntity2.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity2.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.sameids; +package org.hibernate.envers.test.integration.sameids; import javax.persistence.Entity; import javax.persistence.Id; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIds.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/sameids/SameIds.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIds.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.sameids; +package org.hibernate.envers.test.integration.sameids; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/secondary/BasicSecondary.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.secondary; +package org.hibernate.envers.test.integration.secondary; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -88,7 +88,7 @@ @Test public void testTableNames() { assert "secondary_versions".equals(((Iterator<Join>) - getCfg().getClassMapping("org.jboss.envers.test.integration.secondary.SecondaryTestEntity_versions") + getCfg().getClassMapping("org.hibernate.envers.test.integration.secondary.SecondaryTestEntity_versions") .getJoinIterator()) .next().getTable().getName()); } Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/secondary/NamingSecondary.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.secondary; +package org.hibernate.envers.test.integration.secondary; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -88,7 +88,7 @@ @Test public void testTableNames() { assert "sec_versions".equals(((Iterator<Join>) - getCfg().getClassMapping("org.jboss.envers.test.integration.secondary.SecondaryNamingTestEntity_versions") + getCfg().getClassMapping("org.hibernate.envers.test.integration.secondary.SecondaryNamingTestEntity_versions") .getJoinIterator()) .next().getTable().getName()); } Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/SecondaryNamingTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/secondary/SecondaryNamingTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/SecondaryNamingTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.secondary; +package org.hibernate.envers.test.integration.secondary; import javax.persistence.Column; import javax.persistence.Entity; @@ -29,8 +29,8 @@ import javax.persistence.Id; import javax.persistence.SecondaryTable; -import org.jboss.envers.SecondaryVersionsTable; -import org.jboss.envers.Versioned; +import org.hibernate.envers.SecondaryVersionsTable; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/SecondaryTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/secondary/SecondaryTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/SecondaryTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.secondary; +package org.hibernate.envers.test.integration.secondary; import javax.persistence.Column; import javax.persistence.Entity; @@ -29,7 +29,7 @@ import javax.persistence.Id; import javax.persistence.SecondaryTable; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/secondary/ids/EmbIdSecondary.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.secondary.ids; +package org.hibernate.envers.test.integration.secondary.ids; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.EmbId; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.EmbId; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -87,7 +87,7 @@ @Test public void testTableNames() { assert "sec_embid_versions".equals(((Iterator<Join>) - getCfg().getClassMapping("org.jboss.envers.test.integration.secondary.ids.SecondaryEmbIdTestEntity_versions") + getCfg().getClassMapping("org.hibernate.envers.test.integration.secondary.ids.SecondaryEmbIdTestEntity_versions") .getJoinIterator()) .next().getTable().getName()); } Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/secondary/ids/MulIdSecondary.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.secondary.ids; +package org.hibernate.envers.test.integration.secondary.ids; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.test.entities.ids.MulId; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.entities.ids.MulId; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -87,7 +87,7 @@ @Test public void testTableNames() { assert "sec_mulid_versions".equals(((Iterator<Join>) - getCfg().getClassMapping("org.jboss.envers.test.integration.secondary.ids.SecondaryMulIdTestEntity_versions") + getCfg().getClassMapping("org.hibernate.envers.test.integration.secondary.ids.SecondaryMulIdTestEntity_versions") .getJoinIterator()) .next().getTable().getName()); } Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.secondary.ids; +package org.hibernate.envers.test.integration.secondary.ids; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.SecondaryTable; -import org.jboss.envers.SecondaryVersionsTable; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.EmbId; +import org.hibernate.envers.SecondaryVersionsTable; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.EmbId; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.secondary.ids; +package org.hibernate.envers.test.integration.secondary.ids; import javax.persistence.Column; import javax.persistence.Entity; @@ -29,9 +29,9 @@ import javax.persistence.IdClass; import javax.persistence.SecondaryTable; -import org.jboss.envers.SecondaryVersionsTable; -import org.jboss.envers.Versioned; -import org.jboss.envers.test.entities.ids.MulId; +import org.hibernate.envers.SecondaryVersionsTable; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.test.entities.ids.MulId; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/superclass/MappedSubclassing.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/superclass/MappedSubclassing.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/superclass/MappedSubclassing.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.superclass; +package org.hibernate.envers.test.integration.superclass; import java.util.Arrays; import javax.persistence.EntityManager; -import org.jboss.envers.test.AbstractEntityTest; +import org.hibernate.envers.test.AbstractEntityTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/superclass/SubclassEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/superclass/SubclassEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/superclass/SubclassEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.superclass; +package org.hibernate.envers.test.integration.superclass; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/superclass/SuperclassOfEntity.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/integration/superclass/SuperclassOfEntity.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/superclass/SuperclassOfEntity.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.integration.superclass; +package org.hibernate.envers.test.integration.superclass; import javax.persistence.MappedSuperclass; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/performance/AbstractPerformanceTest.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.performance; +package org.hibernate.envers.test.performance; -import org.jboss.envers.test.AbstractEntityTest; -import org.jboss.envers.tools.Pair; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.envers.tools.Pair; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/performance/InsertsPerformance.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/performance/InsertsPerformance.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/performance/InsertsPerformance.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.performance; +package org.hibernate.envers.test.performance; import java.io.IOException; import javax.persistence.EntityManager; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.UnversionedStrTestEntity; -import org.jboss.envers.tools.Pair; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.envers.tools.Pair; import org.hibernate.ejb.Ejb3Configuration; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/performance/UpdatesPerformance.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/performance/UpdatesPerformance.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/performance/UpdatesPerformance.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.performance; +package org.hibernate.envers.test.performance; import java.io.IOException; import java.util.ArrayList; @@ -29,9 +29,9 @@ import java.util.Random; import javax.persistence.EntityManager; -import org.jboss.envers.test.entities.StrTestEntity; -import org.jboss.envers.test.entities.UnversionedStrTestEntity; -import org.jboss.envers.tools.Pair; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.envers.tools.Pair; import org.hibernate.ejb.Ejb3Configuration; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/tools/TestTools.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.tools; +package org.hibernate.envers.test.tools; import java.util.Arrays; import java.util.HashMap; Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/various/Address.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/various/Address.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/various/Address.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.various; +package org.hibernate.envers.test.various; import java.util.Set; import javax.persistence.Entity; @@ -29,7 +29,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/various/HsqlTest.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/various/HsqlTest.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/various/HsqlTest.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.various; +package org.hibernate.envers.test.various; import java.util.HashMap; import java.util.HashSet; @@ -102,11 +102,11 @@ Session sesion = (Session) entityManager.getDelegate(); System.out.println(sesion.createQuery( - "select e from org.jboss.envers.demo.Person_versions e " + + "select e from org.hibernate.envers.demo.Person_versions e " + "where " + "e.originalId._revision.id =" + "(select max(e2.originalId._revision.id) " + - "from org.jboss.envers.demo.Person_versions e2 " + + "from org.hibernate.envers.demo.Person_versions e2 " + "where e.originalId.id = :p0) ") .setParameter("p0", 1) .list()); Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/various/Person.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/envers/test/various/Person.java 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/various/Person.java 2008-10-29 16:34:25 UTC (rev 15436) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.test.various; +package org.hibernate.envers.test.various; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.ManyToOne; -import org.jboss.envers.Versioned; +import org.hibernate.envers.Versioned; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/test/resources/hibernate.test.cfg.xml =================================================================== --- core/trunk/envers/src/test/resources/hibernate.test.cfg.xml 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/resources/hibernate.test.cfg.xml 2008-10-29 16:34:25 UTC (rev 15436) @@ -24,22 +24,22 @@ <property name="format_sql">true</property> <event type="post-insert"> - <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.event.VersionsEventListener" /> </event> <event type="post-update"> - <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.event.VersionsEventListener" /> </event> <event type="post-delete"> - <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.event.VersionsEventListener" /> </event> <event type="pre-collection-update"> - <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.event.VersionsEventListener" /> </event> <event type="pre-collection-remove"> - <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.event.VersionsEventListener" /> </event> <event type="post-collection-recreate"> - <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.event.VersionsEventListener" /> </event> </session-factory> </hibernate-configuration> \ No newline at end of file Modified: core/trunk/envers/src/test/resources/testng.xml =================================================================== --- core/trunk/envers/src/test/resources/testng.xml 2008-10-29 15:51:05 UTC (rev 15435) +++ core/trunk/envers/src/test/resources/testng.xml 2008-10-29 16:34:25 UTC (rev 15436) @@ -3,38 +3,38 @@ <suite name="Envers"> <test name="All"> <packages> - <package name="org.hibernate.envers.envers.test.integration.basic" /> - <package name="org.hibernate.envers.envers.test.integration.cache" /> - <package name="org.hibernate.envers.envers.test.integration.collection" /> - <package name="org.hibernate.envers.envers.test.integration.collection.mapkey" /> - <package name="org.hibernate.envers.envers.test.integration.components" /> - <package name="org.hibernate.envers.envers.test.integration.customtype" /> - <package name="org.hibernate.envers.envers.test.integration.data" /> - <package name="org.hibernate.envers.envers.test.integration.flush" /> - <package name="org.hibernate.envers.envers.test.integration.ids" /> - <package name="org.hibernate.envers.envers.test.integration.inheritance.single" /> - <package name="org.hibernate.envers.envers.test.integration.inheritance.single.childrelation" /> - <package name="org.hibernate.envers.envers.test.integration.inheritance.single.relation" /> - <package name="org.hibernate.envers.envers.test.integration.manytomany" /> - <package name="org.hibernate.envers.envers.test.integration.manytomany.ternary" /> - <package name="org.hibernate.envers.envers.test.integration.manytomany.unidirectional" /> - <package name="org.hibernate.envers.envers.test.integration.naming" /> - <package name="org.hibernate.envers.envers.test.integration.naming.ids" /> - <package name="org.hibernate.envers.envers.test.integration.notinsertable" /> - <package name="org.hibernate.envers.envers.test.integration.onetomany" /> - <package name="org.hibernate.envers.envers.test.integration.onetomany.detached" /> - <package name="org.hibernate.envers.envers.test.integration.onetoone.bidirectional" /> - <package name="org.hibernate.envers.envers.test.integration.onetoone.bidirectional.ids" /> - <package name="org.hibernate.envers.envers.test.integration.onetoone.unidirectional" /> - <package name="org.hibernate.envers.envers.test.integration.properties" /> - <package name="org.hibernate.envers.envers.test.integration.query" /> - <package name="org.hibernate.envers.envers.test.integration.query.ids" /> - <package name="org.hibernate.envers.envers.test.integration.reventity" /> - <package name="org.hibernate.envers.envers.test.integration.revfordate" /> - <package name="org.hibernate.envers.envers.test.integration.sameids" /> - <package name="org.hibernate.envers.envers.test.integration.secondary" /> - <package name="org.hibernate.envers.envers.test.integration.secondary.ids" /> - <package name="org.hibernate.envers.envers.test.integration.superclass" /> + <package name="org.hibernate.envers.test.integration.basic" /> + <package name="org.hibernate.envers.test.integration.cache" /> + <package name="org.hibernate.envers.test.integration.collection" /> + <package name="org.hibernate.envers.test.integration.collection.mapkey" /> + <package name="org.hibernate.envers.test.integration.components" /> + <package name="org.hibernate.envers.test.integration.customtype" /> + <package name="org.hibernate.envers.test.integration.data" /> + <package name="org.hibernate.envers.test.integration.flush" /> + <package name="org.hibernate.envers.test.integration.ids" /> + <package name="org.hibernate.envers.test.integration.inheritance.single" /> + <package name="org.hibernate.envers.test.integration.inheritance.single.childrelation" /> + <package name="org.hibernate.envers.test.integration.inheritance.single.relation" /> + <package name="org.hibernate.envers.test.integration.manytomany" /> + <package name="org.hibernate.envers.test.integration.manytomany.ternary" /> + <package name="org.hibernate.envers.test.integration.manytomany.unidirectional" /> + <package name="org.hibernate.envers.test.integration.naming" /> + <package name="org.hibernate.envers.test.integration.naming.ids" /> + <package name="org.hibernate.envers.test.integration.notinsertable" /> + <package name="org.hibernate.envers.test.integration.onetomany" /> + <package name="org.hibernate.envers.test.integration.onetomany.detached" /> + <package name="org.hibernate.envers.test.integration.onetoone.bidirectional" /> + <package name="org.hibernate.envers.test.integration.onetoone.bidirectional.ids" /> + <package name="org.hibernate.envers.test.integration.onetoone.unidirectional" /> + <package name="org.hibernate.envers.test.integration.properties" /> + <package name="org.hibernate.envers.test.integration.query" /> + <package name="org.hibernate.envers.test.integration.query.ids" /> + <package name="org.hibernate.envers.test.integration.reventity" /> + <package name="org.hibernate.envers.test.integration.revfordate" /> + <package name="org.hibernate.envers.test.integration.sameids" /> + <package name="org.hibernate.envers.test.integration.secondary" /> + <package name="org.hibernate.envers.test.integration.secondary.ids" /> + <package name="org.hibernate.envers.test.integration.superclass" /> </packages> </test> </suite> \ No newline at end of file

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15435 - in core/trunk/envers/src: main/java/org and 34 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-29 11:51:05 -0400 (Wed, 29 Oct 2008) New Revision: 15435 Added: core/trunk/envers/src/test/java/org/hibernate/ core/trunk/envers/src/test/java/org/hibernate/envers/ core/trunk/envers/src/test/java/org/hibernate/envers/envers/ Removed: core/trunk/envers/src/main/java/org/jboss/ core/trunk/envers/src/test/java/org/jboss/ Modified: core/trunk/envers/src/demo/resources/META-INF/persistence.xml core/trunk/envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java core/trunk/envers/src/main/java/org/hibernate/envers/ModificationStore.java core/trunk/envers/src/main/java/org/hibernate/envers/RevisionEntity.java core/trunk/envers/src/main/java/org/hibernate/envers/RevisionListener.java core/trunk/envers/src/main/java/org/hibernate/envers/RevisionNumber.java core/trunk/envers/src/main/java/org/hibernate/envers/RevisionTimestamp.java core/trunk/envers/src/main/java/org/hibernate/envers/RevisionType.java core/trunk/envers/src/main/java/org/hibernate/envers/SecondaryVersionsTable.java core/trunk/envers/src/main/java/org/hibernate/envers/SecondaryVersionsTables.java core/trunk/envers/src/main/java/org/hibernate/envers/Unversioned.java core/trunk/envers/src/main/java/org/hibernate/envers/Versioned.java core/trunk/envers/src/main/java/org/hibernate/envers/VersionsJoinTable.java core/trunk/envers/src/main/java/org/hibernate/envers/VersionsReader.java core/trunk/envers/src/main/java/org/hibernate/envers/VersionsReaderFactory.java core/trunk/envers/src/main/java/org/hibernate/envers/VersionsTable.java core/trunk/envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java core/trunk/envers/src/main/java/org/hibernate/envers/ant/ConfigurationTaskWithEnvers.java core/trunk/envers/src/main/java/org/hibernate/envers/ant/JPAConfigurationTaskWithEnvers.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/PersistentClassGraphDefiner.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/RevisionInfoConfiguration.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/VersionsConfiguration.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/VersionsEntitiesConfiguration.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AnnotationsMetadataReader.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/BasicMetadataGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/EntityXmlMappingData.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/InheritanceType.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/PersistentClassVersioningData.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/PropertyStoreInfo.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/QueryGeneratorBuilder.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/ToOneRelationMetadataGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/VersionsMetadataGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntitiesConfigurations.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntityInstantiator.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/IdMappingData.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/RelationDescription.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/RelationType.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/RevisionTypeType.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/CompositeMapperBuilder.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/ExtendedPropertyMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/MapPropertyMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/PersistentCollectionChangeData.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SimpleMapperBuilder.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractCompositeIdMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractIdMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/EmbeddedIdMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/IdMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/MultipleIdMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/QueryParameterData.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/SimpleIdMapperBuilder.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/SingleIdMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/BasicCollectionMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/CommonCollectionMapperData.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ListCollectionMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MapCollectionMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleComponentData.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleIdData.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleComponentMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleDummyComponentMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleRelatedComponentMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleSimpleComponentMapper.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/Initializor.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/CollectionProxy.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/ListProxy.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/MapProxy.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SetProxy.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedMapProxy.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedSetProxy.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneVersionsEntityQueryGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/QueryGeneratorTools.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/RelationQueryGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/entity/VersionsInheritanceEntityPersister.java core/trunk/envers/src/main/java/org/hibernate/envers/event/VersionsEventListener.java core/trunk/envers/src/main/java/org/hibernate/envers/exception/NotVersionedException.java core/trunk/envers/src/main/java/org/hibernate/envers/exception/RevisionDoesNotExistException.java core/trunk/envers/src/main/java/org/hibernate/envers/exception/VersionsException.java core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionProperty.java core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionTypeProperty.java core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsQuery.java core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsQueryCreator.java core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsRestrictions.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedFieldVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/BetweenVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/CriteriaTools.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/ExtendableCriterion.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/IdentifierEqVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/InVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/LogicalVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NotNullVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NotVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NullVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/PropertyVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RelatedVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RevisionVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/SimpleVersionsExpression.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsConjunction.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsCriterion.java core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsDisjunction.java core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/AbstractVersionsQuery.java core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/RevisionsOfEntityQuery.java core/trunk/envers/src/main/java/org/hibernate/envers/query/order/RevisionVersionsOrder.java core/trunk/envers/src/main/java/org/hibernate/envers/query/order/VersionsOrder.java core/trunk/envers/src/main/java/org/hibernate/envers/query/projection/RevisionVersionsProjection.java core/trunk/envers/src/main/java/org/hibernate/envers/query/projection/VersionsProjection.java core/trunk/envers/src/main/java/org/hibernate/envers/reader/FirstLevelCache.java core/trunk/envers/src/main/java/org/hibernate/envers/reader/VersionsReaderImpl.java core/trunk/envers/src/main/java/org/hibernate/envers/reader/VersionsReaderImplementor.java core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/DefaultRevisionInfoGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoGenerator.java core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoNumberReader.java core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoQueryCreator.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/VersionsSync.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/VersionsSyncManager.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/AbstractVersionsWorkUnit.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckDispatcher.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckResult.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckVisitor.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/ModWorkUnit.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/PersistentCollectionChangeWorkUnit.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/VersionsWorkUnit.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/ArgumentsTools.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/ArraysTools.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/ConcurrentReferenceHashMap.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/HibernateVersion.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/MutableBoolean.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/MutableInteger.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/Pair.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/StringTools.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/Tools.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/Triple.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/GraphDefiner.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/GraphTopologicalSort.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/TopologicalSort.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/Vertex.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/log/YLog.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/log/YLogManager.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/query/Parameters.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/ReflectionTools.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YClass.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YMethodsAndClasses.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YProperty.java core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YReflectionManager.java core/trunk/envers/src/test/resources/hibernate.test.cfg.xml core/trunk/envers/src/test/resources/testng.xml Log: HHH-3550 : import annotations into core Modified: core/trunk/envers/src/demo/resources/META-INF/persistence.xml =================================================================== --- core/trunk/envers/src/demo/resources/META-INF/persistence.xml 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/demo/resources/META-INF/persistence.xml 2008-10-29 15:51:05 UTC (rev 15435) @@ -2,8 +2,8 @@ <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0"> <persistence-unit name="ConsolePU"> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <class>org.jboss.envers.demo.Address</class> - <class>org.jboss.envers.demo.Person</class> + <class>org.hibernate.envers.envers.demo.Address</class> + <class>org.hibernate.envers.envers.demo.Person</class> <exclude-unlisted-classes /> <properties> <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> @@ -22,9 +22,9 @@  - <property name="hibernate.ejb.event.post-insert" value="org.jboss.envers.event.VersionsEventListener" /> - <property name="hibernate.ejb.event.post-update" value="org.jboss.envers.event.VersionsEventListener" /> - <property name="hibernate.ejb.event.post-delete" value="org.jboss.envers.event.VersionsEventListener" /> + <property name="hibernate.ejb.event.post-insert" value="org.hibernate.envers.envers.event.VersionsEventListener" /> + <property name="hibernate.ejb.event.post-update" value="org.hibernate.envers.envers.event.VersionsEventListener" /> + <property name="hibernate.ejb.event.post-delete" value="org.hibernate.envers.envers.event.VersionsEventListener" /> </properties> </persistence-unit> </persistence> \ No newline at end of file Modified: core/trunk/envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.text.DateFormat; import java.util.Date; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/ModificationStore.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/ModificationStore.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/ModificationStore.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/RevisionEntity.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/RevisionEntity.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/RevisionEntity.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/RevisionListener.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/RevisionListener.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/RevisionListener.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; /** * An implementation of this class, having a no-arg constructor, should be passed as an argument to the Modified: core/trunk/envers/src/main/java/org/hibernate/envers/RevisionNumber.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/RevisionNumber.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/RevisionNumber.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/RevisionTimestamp.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/RevisionTimestamp.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/RevisionTimestamp.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/RevisionType.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/RevisionType.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/RevisionType.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; /** * Type of the revision. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/SecondaryVersionsTable.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/SecondaryVersionsTable.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/SecondaryVersionsTable.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/SecondaryVersionsTables.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/SecondaryVersionsTables.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/SecondaryVersionsTables.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/Unversioned.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/Unversioned.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/Unversioned.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/Versioned.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/Versioned.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/Versioned.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/VersionsJoinTable.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/VersionsJoinTable.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/VersionsJoinTable.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/VersionsReader.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/VersionsReader.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/VersionsReader.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.util.Date; import java.util.List; -import org.jboss.envers.exception.NotVersionedException; -import org.jboss.envers.exception.RevisionDoesNotExistException; -import org.jboss.envers.query.VersionsQueryCreator; +import org.hibernate.envers.exception.NotVersionedException; +import org.hibernate.envers.exception.RevisionDoesNotExistException; +import org.hibernate.envers.query.VersionsQueryCreator; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/VersionsReaderFactory.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/VersionsReaderFactory.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/VersionsReaderFactory.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import javax.persistence.EntityManager; -import org.jboss.envers.event.VersionsEventListener; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.reader.VersionsReaderImpl; -import static org.jboss.envers.tools.ArraysTools.arrayIncludesInstanceOf; +import org.hibernate.envers.event.VersionsEventListener; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.reader.VersionsReaderImpl; +import static org.hibernate.envers.tools.ArraysTools.arrayIncludesInstanceOf; import org.hibernate.Session; import org.hibernate.engine.SessionImplementor; @@ -44,7 +44,7 @@ /** * Create a versions reader associated with an open session. * <b>WARNING:</b> Using Envers with Hibernate (not with Hibernate Entity Manager/JPA) is experimental, - * if possible, use {@link org.jboss.envers.VersionsReaderFactory#get(javax.persistence.EntityManager)}. + * if possible, use {@link org.hibernate.envers.VersionsReaderFactory#get(javax.persistence.EntityManager)}. * @param session An open session. * @return A versions reader associated with the given sesison. It shouldn't be used * after the session is closed. @@ -65,7 +65,7 @@ } } - throw new VersionsException("You need install the org.jboss.envers.event.VersionsEventListener " + + throw new VersionsException("You need install the org.hibernate.envers.event.VersionsEventListener " + "class as post insert, update and delete event listener."); } Modified: core/trunk/envers/src/main/java/org/hibernate/envers/VersionsTable.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/VersionsTable.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/VersionsTable.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers; +package org.hibernate.envers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.ant; +package org.hibernate.envers.ant; -import org.jboss.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.configuration.VersionsConfiguration; import org.hibernate.cfg.Configuration; import org.hibernate.tool.ant.AnnotationConfigurationTask; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/ant/ConfigurationTaskWithEnvers.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/ant/ConfigurationTaskWithEnvers.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/ant/ConfigurationTaskWithEnvers.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.ant; +package org.hibernate.envers.ant; -import org.jboss.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.configuration.VersionsConfiguration; import org.hibernate.cfg.Configuration; import org.hibernate.tool.ant.ConfigurationTask; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/ant/JPAConfigurationTaskWithEnvers.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/ant/JPAConfigurationTaskWithEnvers.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/ant/JPAConfigurationTaskWithEnvers.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.ant; +package org.hibernate.envers.ant; -import org.jboss.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.configuration.VersionsConfiguration; import org.hibernate.cfg.Configuration; import org.hibernate.tool.ant.JPAConfigurationTask; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration; +package org.hibernate.envers.configuration; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -37,14 +37,14 @@ import org.dom4j.io.DOMWriter; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; -import org.jboss.envers.configuration.metadata.AnnotationsMetadataReader; -import org.jboss.envers.configuration.metadata.EntityXmlMappingData; -import org.jboss.envers.configuration.metadata.PersistentClassVersioningData; -import org.jboss.envers.configuration.metadata.VersionsMetadataGenerator; -import org.jboss.envers.entities.EntitiesConfigurations; -import org.jboss.envers.tools.StringTools; -import org.jboss.envers.tools.graph.GraphTopologicalSort; -import org.jboss.envers.tools.reflection.YReflectionManager; +import org.hibernate.envers.configuration.metadata.AnnotationsMetadataReader; +import org.hibernate.envers.configuration.metadata.EntityXmlMappingData; +import org.hibernate.envers.configuration.metadata.PersistentClassVersioningData; +import org.hibernate.envers.configuration.metadata.VersionsMetadataGenerator; +import org.hibernate.envers.entities.EntitiesConfigurations; +import org.hibernate.envers.tools.StringTools; +import org.hibernate.envers.tools.graph.GraphTopologicalSort; +import org.hibernate.envers.tools.reflection.YReflectionManager; import org.hibernate.MappingException; import org.hibernate.cfg.Configuration; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration; +package org.hibernate.envers.configuration; import java.util.Properties; @@ -43,20 +43,20 @@ Which operator to use in correlated subqueries (when we want a property to be equal to the result of a correlated subquery, for example: e.p <operator> (select max(e2.p) where e2.p2 = e.p2 ...). Normally, this should be "=". However, HSQLDB has an issue related to that, so as a workaround, - "in" is used. See {@link org.jboss.envers.test.various.HsqlTest}. + "in" is used. See {@link org.hibernate.envers.test.various.HsqlTest}. */ private final String correlatedSubqueryOperator; public GlobalConfiguration(Properties properties) { - String generateRevisionsForCollectionsStr = properties.getProperty("org.jboss.envers.revisionOnCollectionChange", + String generateRevisionsForCollectionsStr = properties.getProperty("org.hibernate.envers.revisionOnCollectionChange", "true"); generateRevisionsForCollections = Boolean.parseBoolean(generateRevisionsForCollectionsStr); - String warnOnUnsupportedTypesStr = properties.getProperty("org.jboss.envers.warnOnUnsupportedTypes", + String warnOnUnsupportedTypesStr = properties.getProperty("org.hibernate.envers.warnOnUnsupportedTypes", "false"); warnOnUnsupportedTypes = Boolean.parseBoolean(warnOnUnsupportedTypesStr); - String ignoreOptimisticLockingPropertyStr = properties.getProperty("org.jboss.envers.unversionedOptimisticLockingField", + String ignoreOptimisticLockingPropertyStr = properties.getProperty("org.hibernate.envers.unversionedOptimisticLockingField", "false"); unversionedOptimisticLockingField = Boolean.parseBoolean(ignoreOptimisticLockingPropertyStr); Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/PersistentClassGraphDefiner.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/PersistentClassGraphDefiner.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/PersistentClassGraphDefiner.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration; +package org.hibernate.envers.configuration; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.jboss.envers.tools.Tools; -import org.jboss.envers.tools.graph.GraphDefiner; +import org.hibernate.envers.tools.Tools; +import org.hibernate.envers.tools.graph.GraphDefiner; import org.hibernate.cfg.Configuration; import org.hibernate.mapping.PersistentClass; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/RevisionInfoConfiguration.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/RevisionInfoConfiguration.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/RevisionInfoConfiguration.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,28 +21,28 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration; +package org.hibernate.envers.configuration; import java.util.Iterator; import org.dom4j.Document; import org.dom4j.DocumentHelper; import org.dom4j.Element; -import org.jboss.envers.DefaultRevisionEntity; -import org.jboss.envers.RevisionEntity; -import org.jboss.envers.RevisionListener; -import org.jboss.envers.RevisionNumber; -import org.jboss.envers.RevisionTimestamp; -import org.jboss.envers.Versioned; -import org.jboss.envers.configuration.metadata.MetadataTools; -import org.jboss.envers.revisioninfo.DefaultRevisionInfoGenerator; -import org.jboss.envers.revisioninfo.RevisionInfoGenerator; -import org.jboss.envers.revisioninfo.RevisionInfoNumberReader; -import org.jboss.envers.revisioninfo.RevisionInfoQueryCreator; -import org.jboss.envers.tools.MutableBoolean; -import org.jboss.envers.tools.reflection.YClass; -import org.jboss.envers.tools.reflection.YProperty; -import org.jboss.envers.tools.reflection.YReflectionManager; +import org.hibernate.envers.DefaultRevisionEntity; +import org.hibernate.envers.RevisionEntity; +import org.hibernate.envers.RevisionListener; +import org.hibernate.envers.RevisionNumber; +import org.hibernate.envers.RevisionTimestamp; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.configuration.metadata.MetadataTools; +import org.hibernate.envers.revisioninfo.DefaultRevisionInfoGenerator; +import org.hibernate.envers.revisioninfo.RevisionInfoGenerator; +import org.hibernate.envers.revisioninfo.RevisionInfoNumberReader; +import org.hibernate.envers.revisioninfo.RevisionInfoQueryCreator; +import org.hibernate.envers.tools.MutableBoolean; +import org.hibernate.envers.tools.reflection.YClass; +import org.hibernate.envers.tools.reflection.YProperty; +import org.hibernate.envers.tools.reflection.YReflectionManager; import org.hibernate.MappingException; import org.hibernate.cfg.Configuration; @@ -60,7 +60,7 @@ private String revisionPropType; public RevisionInfoConfiguration() { - revisionInfoEntityName = "org.jboss.envers.DefaultRevisionEntity"; + revisionInfoEntityName = "org.hibernate.envers.DefaultRevisionEntity"; revisionInfoIdName = "id"; revisionInfoTimestampName = "timestamp"; revisionInfoTimestampType = "long"; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/VersionsConfiguration.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/VersionsConfiguration.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/VersionsConfiguration.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration; +package org.hibernate.envers.configuration; import java.util.Map; import java.util.Properties; import java.util.WeakHashMap; -import org.jboss.envers.entities.EntitiesConfigurations; -import org.jboss.envers.revisioninfo.RevisionInfoNumberReader; -import org.jboss.envers.revisioninfo.RevisionInfoQueryCreator; -import org.jboss.envers.synchronization.VersionsSyncManager; -import org.jboss.envers.tools.reflection.YReflectionManager; +import org.hibernate.envers.entities.EntitiesConfigurations; +import org.hibernate.envers.revisioninfo.RevisionInfoNumberReader; +import org.hibernate.envers.revisioninfo.RevisionInfoQueryCreator; +import org.hibernate.envers.synchronization.VersionsSyncManager; +import org.hibernate.envers.tools.reflection.YReflectionManager; import org.hibernate.cfg.Configuration; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/VersionsEntitiesConfiguration.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/VersionsEntitiesConfiguration.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/VersionsEntitiesConfiguration.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration; +package org.hibernate.envers.configuration; import java.util.HashMap; import java.util.Map; @@ -50,14 +50,14 @@ public VersionsEntitiesConfiguration(Properties properties, String revisionInfoEntityName) { this.revisionInfoEntityName = revisionInfoEntityName; - versionsTablePrefix = properties.getProperty("org.jboss.envers.versionsTablePrefix", ""); - versionsTableSuffix = properties.getProperty("org.jboss.envers.versionsTableSuffix", "_versions"); + versionsTablePrefix = properties.getProperty("org.hibernate.envers.versionsTablePrefix", ""); + versionsTableSuffix = properties.getProperty("org.hibernate.envers.versionsTableSuffix", "_versions"); originalIdPropName = "originalId"; - revisionPropName = properties.getProperty("org.jboss.envers.revisionFieldName", "_revision"); + revisionPropName = properties.getProperty("org.hibernate.envers.revisionFieldName", "_revision"); - revisionTypePropName = properties.getProperty("org.jboss.envers.revisionTypeFieldName", "_revision_type"); + revisionTypePropName = properties.getProperty("org.hibernate.envers.revisionTypeFieldName", "_revision_type"); revisionTypePropType = "byte"; customVersionsTablesNames = new HashMap<String, String>(); Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AnnotationsMetadataReader.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AnnotationsMetadataReader.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AnnotationsMetadataReader.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,22 +21,22 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import java.lang.annotation.Annotation; import javax.persistence.MapKey; import javax.persistence.Version; -import org.jboss.envers.SecondaryVersionsTable; -import org.jboss.envers.SecondaryVersionsTables; -import org.jboss.envers.Unversioned; -import org.jboss.envers.Versioned; -import org.jboss.envers.VersionsJoinTable; -import org.jboss.envers.VersionsTable; -import org.jboss.envers.configuration.GlobalConfiguration; -import org.jboss.envers.tools.reflection.YClass; -import org.jboss.envers.tools.reflection.YProperty; -import org.jboss.envers.tools.reflection.YReflectionManager; +import org.hibernate.envers.SecondaryVersionsTable; +import org.hibernate.envers.SecondaryVersionsTables; +import org.hibernate.envers.Unversioned; +import org.hibernate.envers.Versioned; +import org.hibernate.envers.VersionsJoinTable; +import org.hibernate.envers.VersionsTable; +import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.tools.reflection.YClass; +import org.hibernate.envers.tools.reflection.YProperty; +import org.hibernate.envers.tools.reflection.YReflectionManager; import org.hibernate.MappingException; import org.hibernate.mapping.PersistentClass; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/BasicMetadataGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/BasicMetadataGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/BasicMetadataGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import java.util.Iterator; import java.util.Properties; import org.dom4j.Element; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.entities.mapper.CompositeMapperBuilder; -import org.jboss.envers.entities.mapper.SimpleMapperBuilder; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.entities.mapper.CompositeMapperBuilder; +import org.hibernate.envers.entities.mapper.SimpleMapperBuilder; import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import java.lang.annotation.Annotation; import java.util.ArrayList; @@ -36,31 +36,31 @@ import javax.persistence.JoinColumn; import org.dom4j.Element; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.VersionsJoinTable; -import org.jboss.envers.entities.EntityConfiguration; -import org.jboss.envers.entities.IdMappingData; -import org.jboss.envers.entities.mapper.CompositeMapperBuilder; -import org.jboss.envers.entities.mapper.relation.BasicCollectionMapper; -import org.jboss.envers.entities.mapper.relation.CommonCollectionMapperData; -import org.jboss.envers.entities.mapper.relation.ListCollectionMapper; -import org.jboss.envers.entities.mapper.relation.MapCollectionMapper; -import org.jboss.envers.entities.mapper.relation.MiddleComponentData; -import org.jboss.envers.entities.mapper.relation.MiddleIdData; -import org.jboss.envers.entities.mapper.relation.component.MiddleDummyComponentMapper; -import org.jboss.envers.entities.mapper.relation.component.MiddleMapKeyIdComponentMapper; -import org.jboss.envers.entities.mapper.relation.component.MiddleMapKeyPropertyComponentMapper; -import org.jboss.envers.entities.mapper.relation.component.MiddleRelatedComponentMapper; -import org.jboss.envers.entities.mapper.relation.component.MiddleSimpleComponentMapper; -import org.jboss.envers.entities.mapper.relation.lazy.proxy.ListProxy; -import org.jboss.envers.entities.mapper.relation.lazy.proxy.MapProxy; -import org.jboss.envers.entities.mapper.relation.lazy.proxy.SetProxy; -import org.jboss.envers.entities.mapper.relation.lazy.proxy.SortedMapProxy; -import org.jboss.envers.entities.mapper.relation.lazy.proxy.SortedSetProxy; -import org.jboss.envers.entities.mapper.relation.query.OneVersionsEntityQueryGenerator; -import org.jboss.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.jboss.envers.tools.StringTools; -import org.jboss.envers.tools.Tools; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.VersionsJoinTable; +import org.hibernate.envers.entities.EntityConfiguration; +import org.hibernate.envers.entities.IdMappingData; +import org.hibernate.envers.entities.mapper.CompositeMapperBuilder; +import org.hibernate.envers.entities.mapper.relation.BasicCollectionMapper; +import org.hibernate.envers.entities.mapper.relation.CommonCollectionMapperData; +import org.hibernate.envers.entities.mapper.relation.ListCollectionMapper; +import org.hibernate.envers.entities.mapper.relation.MapCollectionMapper; +import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.entities.mapper.relation.component.MiddleDummyComponentMapper; +import org.hibernate.envers.entities.mapper.relation.component.MiddleMapKeyIdComponentMapper; +import org.hibernate.envers.entities.mapper.relation.component.MiddleMapKeyPropertyComponentMapper; +import org.hibernate.envers.entities.mapper.relation.component.MiddleRelatedComponentMapper; +import org.hibernate.envers.entities.mapper.relation.component.MiddleSimpleComponentMapper; +import org.hibernate.envers.entities.mapper.relation.lazy.proxy.ListProxy; +import org.hibernate.envers.entities.mapper.relation.lazy.proxy.MapProxy; +import org.hibernate.envers.entities.mapper.relation.lazy.proxy.SetProxy; +import org.hibernate.envers.entities.mapper.relation.lazy.proxy.SortedMapProxy; +import org.hibernate.envers.entities.mapper.relation.lazy.proxy.SortedSetProxy; +import org.hibernate.envers.entities.mapper.relation.query.OneVersionsEntityQueryGenerator; +import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.tools.StringTools; +import org.hibernate.envers.tools.Tools; import org.hibernate.MappingException; import org.hibernate.mapping.Collection; @@ -104,7 +104,7 @@ * @param mainGenerator Main generator, giving access to configuration and the basic mapper. * @param propertyName Name of the property that references the collection in the referencing entity. * @param propertyValue Value of the collection, as mapped by Hibernate. - * @param currentMapper Mapper, to which the appropriate {@link org.jboss.envers.entities.mapper.PropertyMapper} + * @param currentMapper Mapper, to which the appropriate {@link org.hibernate.envers.entities.mapper.PropertyMapper} * will be added. * @param referencingEntityName Name of the entity that owns this collection. * @param xmlMappingData In case this collection requires a middle table, additional mapping documents will Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/EntityXmlMappingData.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/EntityXmlMappingData.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/EntityXmlMappingData.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import java.util.ArrayList; import java.util.List; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,19 +21,19 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import java.util.Iterator; import org.dom4j.Element; import org.dom4j.tree.DefaultElement; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.entities.IdMappingData; -import org.jboss.envers.entities.mapper.SimpleMapperBuilder; -import org.jboss.envers.entities.mapper.id.EmbeddedIdMapper; -import org.jboss.envers.entities.mapper.id.MultipleIdMapper; -import org.jboss.envers.entities.mapper.id.SimpleIdMapperBuilder; -import org.jboss.envers.entities.mapper.id.SingleIdMapper; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.entities.IdMappingData; +import org.hibernate.envers.entities.mapper.SimpleMapperBuilder; +import org.hibernate.envers.entities.mapper.id.EmbeddedIdMapper; +import org.hibernate.envers.entities.mapper.id.MultipleIdMapper; +import org.hibernate.envers.entities.mapper.id.SimpleIdMapperBuilder; +import org.hibernate.envers.entities.mapper.id.SingleIdMapper; import org.hibernate.MappingException; import org.hibernate.mapping.Component; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/InheritanceType.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/InheritanceType.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/InheritanceType.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import org.hibernate.MappingException; import org.hibernate.mapping.JoinedSubclass; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import java.util.Iterator; import javax.persistence.JoinColumn; @@ -29,7 +29,7 @@ import org.dom4j.Attribute; import org.dom4j.Document; import org.dom4j.Element; -import org.jboss.envers.tools.StringTools; +import org.hibernate.envers.tools.StringTools; import org.hibernate.mapping.Column; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/PersistentClassVersioningData.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/PersistentClassVersioningData.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/PersistentClassVersioningData.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.VersionsJoinTable; -import org.jboss.envers.VersionsTable; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.VersionsJoinTable; +import org.hibernate.envers.VersionsTable; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/PropertyStoreInfo.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/PropertyStoreInfo.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/PropertyStoreInfo.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import java.util.Map; -import org.jboss.envers.ModificationStore; +import org.hibernate.envers.ModificationStore; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/QueryGeneratorBuilder.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/QueryGeneratorBuilder.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/QueryGeneratorBuilder.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,19 +21,19 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import java.util.ArrayList; import java.util.List; -import org.jboss.envers.configuration.GlobalConfiguration; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.mapper.relation.MiddleComponentData; -import org.jboss.envers.entities.mapper.relation.MiddleIdData; -import org.jboss.envers.entities.mapper.relation.query.OneEntityQueryGenerator; -import org.jboss.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.jboss.envers.entities.mapper.relation.query.ThreeEntityQueryGenerator; -import org.jboss.envers.entities.mapper.relation.query.TwoEntityQueryGenerator; +import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.entities.mapper.relation.query.OneEntityQueryGenerator; +import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.entities.mapper.relation.query.ThreeEntityQueryGenerator; +import org.hibernate.envers.entities.mapper.relation.query.TwoEntityQueryGenerator; /** * Builds query generators, for reading collection middle tables, along with any related entities. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/ToOneRelationMetadataGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/ToOneRelationMetadataGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/ToOneRelationMetadataGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import org.dom4j.Element; -import org.jboss.envers.entities.EntityConfiguration; -import org.jboss.envers.entities.IdMappingData; -import org.jboss.envers.entities.mapper.CompositeMapperBuilder; -import org.jboss.envers.entities.mapper.id.IdMapper; -import org.jboss.envers.entities.mapper.relation.OneToOneNotOwningMapper; -import org.jboss.envers.entities.mapper.relation.ToOneIdMapper; +import org.hibernate.envers.entities.EntityConfiguration; +import org.hibernate.envers.entities.IdMappingData; +import org.hibernate.envers.entities.mapper.CompositeMapperBuilder; +import org.hibernate.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.entities.mapper.relation.OneToOneNotOwningMapper; +import org.hibernate.envers.entities.mapper.relation.ToOneIdMapper; import org.hibernate.MappingException; import org.hibernate.mapping.OneToOne; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/VersionsMetadataGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/VersionsMetadataGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/VersionsMetadataGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.configuration.metadata; +package org.hibernate.envers.configuration.metadata; import java.util.HashMap; import java.util.Iterator; @@ -29,20 +29,20 @@ import java.util.Map; import org.dom4j.Element; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.VersionsJoinTable; -import org.jboss.envers.configuration.GlobalConfiguration; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.EntityConfiguration; -import org.jboss.envers.entities.IdMappingData; -import org.jboss.envers.entities.mapper.CompositeMapperBuilder; -import org.jboss.envers.entities.mapper.ExtendedPropertyMapper; -import org.jboss.envers.entities.mapper.MultiPropertyMapper; -import org.jboss.envers.entities.mapper.SubclassPropertyMapper; -import org.jboss.envers.entity.VersionsInheritanceEntityPersister; -import org.jboss.envers.tools.StringTools; -import org.jboss.envers.tools.log.YLog; -import org.jboss.envers.tools.log.YLogManager; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.VersionsJoinTable; +import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.EntityConfiguration; +import org.hibernate.envers.entities.IdMappingData; +import org.hibernate.envers.entities.mapper.CompositeMapperBuilder; +import org.hibernate.envers.entities.mapper.ExtendedPropertyMapper; +import org.hibernate.envers.entities.mapper.MultiPropertyMapper; +import org.hibernate.envers.entities.mapper.SubclassPropertyMapper; +import org.hibernate.envers.entity.VersionsInheritanceEntityPersister; +import org.hibernate.envers.tools.StringTools; +import org.hibernate.envers.tools.log.YLog; +import org.hibernate.envers.tools.log.YLogManager; import org.hibernate.MappingException; import org.hibernate.cfg.Configuration; @@ -104,7 +104,7 @@ void addRevisionType(Element any_mapping) { Element revTypeProperty = MetadataTools.addProperty(any_mapping, verEntCfg.getRevisionTypePropName(), verEntCfg.getRevisionTypePropType(), true, false); - revTypeProperty.addAttribute("type", "org.jboss.envers.entities.RevisionTypeType"); + revTypeProperty.addAttribute("type", "org.hibernate.envers.entities.RevisionTypeType"); } private ModificationStore getStoreForProperty(Property property, PropertyStoreInfo propertyStoreInfo, Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntitiesConfigurations.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntitiesConfigurations.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntitiesConfigurations.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities; +package org.hibernate.envers.entities; import java.util.HashMap; import java.util.Map; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities; +package org.hibernate.envers.entities; import java.util.HashMap; import java.util.Map; -import org.jboss.envers.entities.mapper.ExtendedPropertyMapper; -import org.jboss.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.entities.mapper.ExtendedPropertyMapper; +import org.hibernate.envers.entities.mapper.id.IdMapper; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntityInstantiator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntityInstantiator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/EntityInstantiator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities; +package org.hibernate.envers.entities; import java.util.Collection; import java.util.List; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.id.IdMapper; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.reflection.ReflectionTools; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/IdMappingData.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/IdMappingData.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/IdMappingData.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities; +package org.hibernate.envers.entities; import org.dom4j.Element; -import org.jboss.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.entities.mapper.id.IdMapper; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/RelationDescription.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/RelationDescription.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/RelationDescription.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities; +package org.hibernate.envers.entities; -import org.jboss.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.entities.mapper.id.IdMapper; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/RelationType.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/RelationType.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/RelationType.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities; +package org.hibernate.envers.entities; /** * Type of a relation between two entities. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/RevisionTypeType.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/RevisionTypeType.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/RevisionTypeType.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities; +package org.hibernate.envers.entities; import java.io.Serializable; import java.sql.PreparedStatement; @@ -29,7 +29,7 @@ import java.sql.SQLException; import java.sql.Types; -import org.jboss.envers.RevisionType; +import org.hibernate.envers.RevisionType; import org.hibernate.HibernateException; import org.hibernate.usertype.UserType; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/CompositeMapperBuilder.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/CompositeMapperBuilder.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/CompositeMapperBuilder.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper; +package org.hibernate.envers.entities.mapper; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/ExtendedPropertyMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/ExtendedPropertyMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/ExtendedPropertyMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper; +package org.hibernate.envers.entities.mapper; import java.util.Map; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/MapPropertyMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/MapPropertyMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/MapPropertyMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,18 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper; +package org.hibernate.envers.entities.mapper; import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.collection.PersistentCollection; import org.hibernate.property.Getter; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper; +package org.hibernate.envers.entities.mapper; import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.MappingException; import org.hibernate.collection.PersistentCollection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/PersistentCollectionChangeData.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/PersistentCollectionChangeData.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/PersistentCollectionChangeData.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper; +package org.hibernate.envers.entities.mapper; import java.util.Map; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper; +package org.hibernate.envers.entities.mapper; import java.io.Serializable; import java.util.List; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.reader.VersionsReaderImplementor; import org.hibernate.collection.PersistentCollection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SimpleMapperBuilder.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SimpleMapperBuilder.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SimpleMapperBuilder.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper; +package org.hibernate.envers.entities.mapper; -import org.jboss.envers.ModificationStore; +import org.hibernate.envers.ModificationStore; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,18 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper; +package org.hibernate.envers.entities.mapper; import java.io.Serializable; import java.util.List; import java.util.Map; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.Tools; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.Tools; +import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.collection.PersistentCollection; import org.hibernate.property.Setter; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper; +package org.hibernate.envers.entities.mapper; import java.io.Serializable; import java.util.List; import java.util.Map; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.reader.VersionsReaderImplementor; import org.hibernate.collection.PersistentCollection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractCompositeIdMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractCompositeIdMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractCompositeIdMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.id; +package org.hibernate.envers.entities.mapper.id; import java.util.LinkedHashMap; import java.util.Map; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.exception.VersionsException; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.exception.VersionsException; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractIdMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractIdMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractIdMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.id; +package org.hibernate.envers.entities.mapper.id; import java.util.Iterator; import java.util.List; -import org.jboss.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/EmbeddedIdMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/EmbeddedIdMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/EmbeddedIdMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.id; +package org.hibernate.envers.entities.mapper.id; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.property.Getter; import org.hibernate.property.Setter; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/IdMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/IdMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/IdMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.id; +package org.hibernate.envers.entities.mapper.id; import java.util.List; import java.util.Map; -import org.jboss.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/MultipleIdMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/MultipleIdMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/MultipleIdMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.id; +package org.hibernate.envers.entities.mapper.id; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.jboss.envers.exception.VersionsException; +import org.hibernate.envers.exception.VersionsException; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/QueryParameterData.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/QueryParameterData.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/QueryParameterData.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.id; +package org.hibernate.envers.entities.mapper.id; import org.hibernate.Query; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/SimpleIdMapperBuilder.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/SimpleIdMapperBuilder.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/SimpleIdMapperBuilder.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.id; +package org.hibernate.envers.entities.mapper.id; -import org.jboss.envers.entities.mapper.SimpleMapperBuilder; +import org.hibernate.envers.entities.mapper.SimpleMapperBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/SingleIdMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/SingleIdMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/id/SingleIdMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.id; +package org.hibernate.envers.entities.mapper.id; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.jboss.envers.ModificationStore; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.ModificationStore; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.property.Getter; import org.hibernate.property.Setter; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation; +package org.hibernate.envers.entities.mapper.relation; import java.io.Serializable; import java.lang.reflect.Constructor; @@ -34,14 +34,14 @@ import java.util.Map; import java.util.Set; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.PersistentCollectionChangeData; -import org.jboss.envers.entities.mapper.PropertyMapper; -import org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.entities.mapper.PropertyMapper; +import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.collection.PersistentCollection; import org.hibernate.property.Setter; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/BasicCollectionMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/BasicCollectionMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/BasicCollectionMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation; +package org.hibernate.envers.entities.mapper.relation; import java.io.Serializable; import java.util.Collection; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.PropertyMapper; -import org.jboss.envers.entities.mapper.relation.lazy.initializor.BasicCollectionInitializor; -import org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.PropertyMapper; +import org.hibernate.envers.entities.mapper.relation.lazy.initializor.BasicCollectionInitializor; +import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.reader.VersionsReaderImplementor; import org.hibernate.collection.PersistentCollection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/CommonCollectionMapperData.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/CommonCollectionMapperData.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/CommonCollectionMapperData.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation; +package org.hibernate.envers.entities.mapper.relation; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; /** * Data that is used by all collection mappers, regardless of the type. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ListCollectionMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ListCollectionMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ListCollectionMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,21 +21,21 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation; +package org.hibernate.envers.entities.mapper.relation; import java.io.Serializable; import java.util.Collection; import java.util.List; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.PropertyMapper; -import org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor; -import org.jboss.envers.entities.mapper.relation.lazy.initializor.ListCollectionInitializor; -import org.jboss.envers.entities.mapper.relation.lazy.proxy.ListProxy; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.Pair; -import org.jboss.envers.tools.Tools; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.PropertyMapper; +import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.entities.mapper.relation.lazy.initializor.ListCollectionInitializor; +import org.hibernate.envers.entities.mapper.relation.lazy.proxy.ListProxy; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.Pair; +import org.hibernate.envers.tools.Tools; import org.hibernate.collection.PersistentCollection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MapCollectionMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MapCollectionMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MapCollectionMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation; +package org.hibernate.envers.entities.mapper.relation; import java.io.Serializable; import java.util.Collection; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.PropertyMapper; -import org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor; -import org.jboss.envers.entities.mapper.relation.lazy.initializor.MapCollectionInitializor; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.PropertyMapper; +import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.entities.mapper.relation.lazy.initializor.MapCollectionInitializor; +import org.hibernate.envers.reader.VersionsReaderImplementor; import org.hibernate.collection.PersistentCollection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleComponentData.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleComponentData.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleComponentData.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation; +package org.hibernate.envers.entities.mapper.relation; -import org.jboss.envers.entities.mapper.relation.component.MiddleComponentMapper; +import org.hibernate.envers.entities.mapper.relation.component.MiddleComponentMapper; /** * A data holder for a middle relation component (which is either the collection element or index): Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleIdData.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleIdData.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleIdData.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation; +package org.hibernate.envers.entities.mapper.relation; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.IdMappingData; -import org.jboss.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.IdMappingData; +import org.hibernate.envers.entities.mapper.id.IdMapper; /** * A class holding information about ids, which form a virtual "relation" from a middle-table. Middle-tables are used Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,20 +21,20 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation; +package org.hibernate.envers.entities.mapper.relation; import java.io.Serializable; import java.util.List; import java.util.Map; import javax.persistence.NoResultException; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.PersistentCollectionChangeData; -import org.jboss.envers.entities.mapper.PropertyMapper; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.query.VersionsRestrictions; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.entities.mapper.PropertyMapper; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.query.VersionsRestrictions; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.NonUniqueResultException; import org.hibernate.collection.PersistentCollection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,21 +21,21 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation; +package org.hibernate.envers.entities.mapper.relation; import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.PersistentCollectionChangeData; -import org.jboss.envers.entities.mapper.PropertyMapper; -import org.jboss.envers.entities.mapper.id.IdMapper; -import org.jboss.envers.entities.mapper.relation.lazy.ToOneDelegateSessionImplementor; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.Tools; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.entities.mapper.PropertyMapper; +import org.hibernate.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.entities.mapper.relation.lazy.ToOneDelegateSessionImplementor; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.Tools; +import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.collection.PersistentCollection; import org.hibernate.property.Setter; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleComponentMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleComponentMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleComponentMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.component; +package org.hibernate.envers.entities.mapper.relation.component; import java.util.Map; -import org.jboss.envers.entities.EntityInstantiator; -import org.jboss.envers.tools.query.Parameters; +import org.hibernate.envers.entities.EntityInstantiator; +import org.hibernate.envers.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleDummyComponentMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleDummyComponentMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleDummyComponentMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.component; +package org.hibernate.envers.entities.mapper.relation.component; import java.util.Map; -import org.jboss.envers.entities.EntityInstantiator; -import org.jboss.envers.tools.query.Parameters; +import org.hibernate.envers.entities.EntityInstantiator; +import org.hibernate.envers.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.component; +package org.hibernate.envers.entities.mapper.relation.component; import java.util.Map; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.EntityInstantiator; -import org.jboss.envers.entities.mapper.id.IdMapper; -import org.jboss.envers.tools.query.Parameters; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.EntityInstantiator; +import org.hibernate.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.tools.query.Parameters; /** * A component mapper for the @MapKey mapping: the value of the map's key is the id of the entity. This Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.component; +package org.hibernate.envers.entities.mapper.relation.component; import java.util.Map; -import org.jboss.envers.entities.EntityInstantiator; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.entities.EntityInstantiator; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.reflection.ReflectionTools; /** * A component mapper for the @MapKey mapping with the name parameter specified: the value of the map's key Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleRelatedComponentMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleRelatedComponentMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleRelatedComponentMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.component; +package org.hibernate.envers.entities.mapper.relation.component; import java.util.Map; -import org.jboss.envers.entities.EntityInstantiator; -import org.jboss.envers.entities.mapper.relation.MiddleIdData; -import org.jboss.envers.tools.query.Parameters; +import org.hibernate.envers.entities.EntityInstantiator; +import org.hibernate.envers.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleSimpleComponentMapper.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleSimpleComponentMapper.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleSimpleComponentMapper.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.component; +package org.hibernate.envers.entities.mapper.relation.component; import java.util.Map; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.EntityInstantiator; -import org.jboss.envers.tools.query.Parameters; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.EntityInstantiator; +import org.hibernate.envers.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy; +package org.hibernate.envers.entities.mapper.relation.lazy; import java.io.Serializable; import java.sql.Connection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy; +package org.hibernate.envers.entities.mapper.relation.lazy; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.reader.VersionsReaderImplementor; import org.hibernate.HibernateException; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.entities.mapper.relation.lazy.initializor; import java.util.List; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.EntityInstantiator; -import org.jboss.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.EntityInstantiator; +import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.reader.VersionsReaderImplementor; /** * Initializes a persistent collection. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.entities.mapper.relation.lazy.initializor; import java.util.List; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.relation.MiddleComponentData; -import org.jboss.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.reader.VersionsReaderImplementor; /** * Initializes a map. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.entities.mapper.relation.lazy.initializor; import java.util.Collection; import java.util.List; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.relation.MiddleComponentData; -import org.jboss.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.reader.VersionsReaderImplementor; /** * Initializes a non-indexed java collection (set or list, eventually sorted). Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/Initializor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/Initializor.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/Initializor.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.entities.mapper.relation.lazy.initializor; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.entities.mapper.relation.lazy.initializor; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.relation.MiddleComponentData; -import org.jboss.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.reader.VersionsReaderImplementor; /** * Initializes a map. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.entities.mapper.relation.lazy.initializor; import java.util.List; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.mapper.relation.MiddleComponentData; -import org.jboss.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.reader.VersionsReaderImplementor; /** * Initializes a map. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/CollectionProxy.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/CollectionProxy.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/CollectionProxy.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,18 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.entities.mapper.relation.lazy.proxy; import java.util.Collection; import java.util.Iterator; -import org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; /** * @author Adam Warski (adam at warski dot org) */ public abstract class CollectionProxy<U, T extends Collection<U>> implements Collection<U> { - private org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor<T> initializor; + private org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor<T> initializor; protected T delegate; public CollectionProxy(Initializor<T> initializor) { Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/ListProxy.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/ListProxy.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/ListProxy.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.entities.mapper.relation.lazy.proxy; import java.util.Collection; import java.util.List; @@ -31,7 +31,7 @@ * @author Adam Warski (adam at warski dot org) */ public class ListProxy<U> extends CollectionProxy<U, List<U>> implements List<U> { - public ListProxy(org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor<List<U>> initializor) { + public ListProxy(org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor<List<U>> initializor) { super(initializor); } Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/MapProxy.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/MapProxy.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/MapProxy.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.entities.mapper.relation.lazy.proxy; import java.util.Collection; import java.util.Map; import java.util.Set; -import org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; /** * @author Adam Warski (adam at warski dot org) @@ -36,7 +36,7 @@ private Initializor<Map<K, V>> initializor; protected Map<K, V> delegate; - public MapProxy(org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor<Map<K, V>> initializor) { + public MapProxy(org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor<Map<K, V>> initializor) { this.initializor = initializor; } Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SetProxy.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SetProxy.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SetProxy.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.entities.mapper.relation.lazy.proxy; import java.util.Set; @@ -29,7 +29,7 @@ * @author Adam Warski (adam at warski dot org) */ public class SetProxy<U> extends CollectionProxy<U, Set<U>> implements Set<U> { - public SetProxy(org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor<Set<U>> initializor) { + public SetProxy(org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor<Set<U>> initializor) { super(initializor); } } Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedMapProxy.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedMapProxy.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedMapProxy.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.entities.mapper.relation.lazy.proxy; import java.util.Collection; import java.util.Comparator; @@ -29,7 +29,7 @@ import java.util.Set; import java.util.SortedMap; -import org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; /** * @author Adam Warski (adam at warski dot org) @@ -38,7 +38,7 @@ private Initializor<SortedMap<K, V>> initializor; protected SortedMap<K, V> delegate; - public SortedMapProxy(org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor<SortedMap<K, V>> initializor) { + public SortedMapProxy(org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor<SortedMap<K, V>> initializor) { this.initializor = initializor; } Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedSetProxy.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedSetProxy.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedSetProxy.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.entities.mapper.relation.lazy.proxy; import java.util.Comparator; import java.util.SortedSet; @@ -30,7 +30,7 @@ * @author Adam Warski (adam at warski dot org) */ public class SortedSetProxy<U> extends CollectionProxy<U, SortedSet<U>> implements SortedSet<U> { - public SortedSetProxy(org.jboss.envers.entities.mapper.relation.lazy.initializor.Initializor<SortedSet<U>> initializor) { + public SortedSetProxy(org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor<SortedSet<U>> initializor) { super(initializor); } Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,18 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.query; +package org.hibernate.envers.entities.mapper.relation.query; import java.util.Collections; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.mapper.id.QueryParameterData; -import org.jboss.envers.entities.mapper.relation.MiddleComponentData; -import org.jboss.envers.entities.mapper.relation.MiddleIdData; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.mapper.id.QueryParameterData; +import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; import org.hibernate.Query; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneVersionsEntityQueryGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneVersionsEntityQueryGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneVersionsEntityQueryGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,19 +21,19 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.query; +package org.hibernate.envers.entities.mapper.relation.query; import java.util.Collections; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.GlobalConfiguration; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.mapper.id.IdMapper; -import org.jboss.envers.entities.mapper.id.QueryParameterData; -import org.jboss.envers.entities.mapper.relation.MiddleIdData; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.entities.mapper.id.QueryParameterData; +import org.hibernate.envers.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; import org.hibernate.Query; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/QueryGeneratorTools.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/QueryGeneratorTools.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/QueryGeneratorTools.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.query; +package org.hibernate.envers.entities.mapper.relation.query; -import org.jboss.envers.configuration.GlobalConfiguration; -import org.jboss.envers.entities.mapper.relation.MiddleComponentData; -import org.jboss.envers.entities.mapper.relation.MiddleIdData; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/RelationQueryGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/RelationQueryGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/RelationQueryGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.query; +package org.hibernate.envers.entities.mapper.relation.query; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.reader.VersionsReaderImplementor; import org.hibernate.Query; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,19 +21,19 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.query; +package org.hibernate.envers.entities.mapper.relation.query; import java.util.Collections; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.GlobalConfiguration; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.mapper.id.QueryParameterData; -import org.jboss.envers.entities.mapper.relation.MiddleComponentData; -import org.jboss.envers.entities.mapper.relation.MiddleIdData; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.mapper.id.QueryParameterData; +import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; import org.hibernate.Query; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,19 +21,19 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entities.mapper.relation.query; +package org.hibernate.envers.entities.mapper.relation.query; import java.util.Collections; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.GlobalConfiguration; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.mapper.id.QueryParameterData; -import org.jboss.envers.entities.mapper.relation.MiddleComponentData; -import org.jboss.envers.entities.mapper.relation.MiddleIdData; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.mapper.id.QueryParameterData; +import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; import org.hibernate.Query; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/entity/VersionsInheritanceEntityPersister.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/entity/VersionsInheritanceEntityPersister.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/entity/VersionsInheritanceEntityPersister.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.entity; +package org.hibernate.envers.entity; import org.hibernate.EntityMode; import org.hibernate.HibernateException; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/event/VersionsEventListener.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/event/VersionsEventListener.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/event/VersionsEventListener.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,22 +21,22 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.event; +package org.hibernate.envers.event; import java.io.Serializable; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.RelationDescription; -import org.jboss.envers.entities.RelationType; -import org.jboss.envers.entities.mapper.PersistentCollectionChangeData; -import org.jboss.envers.entities.mapper.id.IdMapper; -import org.jboss.envers.synchronization.VersionsSync; -import org.jboss.envers.synchronization.work.AddWorkUnit; -import org.jboss.envers.synchronization.work.CollectionChangeWorkUnit; -import org.jboss.envers.synchronization.work.DelWorkUnit; -import org.jboss.envers.synchronization.work.ModWorkUnit; -import org.jboss.envers.synchronization.work.PersistentCollectionChangeWorkUnit; -import org.jboss.envers.tools.Tools; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.RelationDescription; +import org.hibernate.envers.entities.RelationType; +import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.synchronization.VersionsSync; +import org.hibernate.envers.synchronization.work.AddWorkUnit; +import org.hibernate.envers.synchronization.work.CollectionChangeWorkUnit; +import org.hibernate.envers.synchronization.work.DelWorkUnit; +import org.hibernate.envers.synchronization.work.ModWorkUnit; +import org.hibernate.envers.synchronization.work.PersistentCollectionChangeWorkUnit; +import org.hibernate.envers.tools.Tools; import org.hibernate.cfg.Configuration; import org.hibernate.collection.PersistentCollection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/exception/NotVersionedException.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/exception/NotVersionedException.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/exception/NotVersionedException.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.exception; +package org.hibernate.envers.exception; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/exception/RevisionDoesNotExistException.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/exception/RevisionDoesNotExistException.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/exception/RevisionDoesNotExistException.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.exception; +package org.hibernate.envers.exception; import java.util.Date; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/exception/VersionsException.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/exception/VersionsException.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/exception/VersionsException.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.exception; +package org.hibernate.envers.exception; import org.hibernate.HibernateException; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionProperty.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionProperty.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionProperty.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query; +package org.hibernate.envers.query; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.query.criteria.RevisionVersionsExpression; -import org.jboss.envers.query.criteria.VersionsCriterion; -import org.jboss.envers.query.order.RevisionVersionsOrder; -import org.jboss.envers.query.order.VersionsOrder; -import org.jboss.envers.query.projection.RevisionVersionsProjection; -import org.jboss.envers.query.projection.VersionsProjection; -import org.jboss.envers.tools.Triple; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.query.criteria.RevisionVersionsExpression; +import org.hibernate.envers.query.criteria.VersionsCriterion; +import org.hibernate.envers.query.order.RevisionVersionsOrder; +import org.hibernate.envers.query.order.VersionsOrder; +import org.hibernate.envers.query.projection.RevisionVersionsProjection; +import org.hibernate.envers.query.projection.VersionsProjection; +import org.hibernate.envers.tools.Triple; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionTypeProperty.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionTypeProperty.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionTypeProperty.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query; +package org.hibernate.envers.query; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.query.projection.VersionsProjection; -import org.jboss.envers.tools.Triple; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.query.projection.VersionsProjection; +import org.hibernate.envers.tools.Triple; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsQuery.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsQuery.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsQuery.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query; +package org.hibernate.envers.query; import java.util.List; import javax.persistence.NoResultException; import javax.persistence.NonUniqueResultException; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.query.criteria.VersionsCriterion; -import org.jboss.envers.query.order.VersionsOrder; -import org.jboss.envers.query.projection.VersionsProjection; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.query.criteria.VersionsCriterion; +import org.hibernate.envers.query.order.VersionsOrder; +import org.hibernate.envers.query.projection.VersionsProjection; import org.hibernate.CacheMode; import org.hibernate.FlushMode; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsQueryCreator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsQueryCreator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsQueryCreator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query; +package org.hibernate.envers.query; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.query.impl.EntitiesAtRevisionQuery; -import org.jboss.envers.query.impl.RevisionsOfEntityQuery; -import org.jboss.envers.reader.VersionsReaderImplementor; -import static org.jboss.envers.tools.ArgumentsTools.checkNotNull; -import static org.jboss.envers.tools.ArgumentsTools.checkPositive; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.query.impl.EntitiesAtRevisionQuery; +import org.hibernate.envers.query.impl.RevisionsOfEntityQuery; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import static org.hibernate.envers.tools.ArgumentsTools.checkNotNull; +import static org.hibernate.envers.tools.ArgumentsTools.checkPositive; /** * @author Adam Warski (adam at warski dot org) @@ -63,8 +63,8 @@ * <ol> * <li>the entity instance</li> * <li>revision entity, corresponding to the revision at which the entity was modified. If no custom - * revision entity is used, this will be an instance of {@link org.jboss.envers.DefaultRevisionEntity}</li> - * <li>type of the revision (an enum instance of class {@link org.jboss.envers.RevisionType})</li>. + * revision entity is used, this will be an instance of {@link org.hibernate.envers.DefaultRevisionEntity}</li> + * <li>type of the revision (an enum instance of class {@link org.hibernate.envers.RevisionType})</li>. * </ol> * Additional conditions that the results must satisfy may be specified. * @param c Class of the entities for which to query. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsRestrictions.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsRestrictions.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/VersionsRestrictions.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,24 +21,24 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query; +package org.hibernate.envers.query; import java.util.Collection; -import org.jboss.envers.query.criteria.AggregatedFieldVersionsExpression; -import org.jboss.envers.query.criteria.BetweenVersionsExpression; -import org.jboss.envers.query.criteria.IdentifierEqVersionsExpression; -import org.jboss.envers.query.criteria.InVersionsExpression; -import org.jboss.envers.query.criteria.LogicalVersionsExpression; -import org.jboss.envers.query.criteria.NotNullVersionsExpression; -import org.jboss.envers.query.criteria.NotVersionsExpression; -import org.jboss.envers.query.criteria.NullVersionsExpression; -import org.jboss.envers.query.criteria.PropertyVersionsExpression; -import org.jboss.envers.query.criteria.RelatedVersionsExpression; -import org.jboss.envers.query.criteria.SimpleVersionsExpression; -import org.jboss.envers.query.criteria.VersionsConjunction; -import org.jboss.envers.query.criteria.VersionsCriterion; -import org.jboss.envers.query.criteria.VersionsDisjunction; +import org.hibernate.envers.query.criteria.AggregatedFieldVersionsExpression; +import org.hibernate.envers.query.criteria.BetweenVersionsExpression; +import org.hibernate.envers.query.criteria.IdentifierEqVersionsExpression; +import org.hibernate.envers.query.criteria.InVersionsExpression; +import org.hibernate.envers.query.criteria.LogicalVersionsExpression; +import org.hibernate.envers.query.criteria.NotNullVersionsExpression; +import org.hibernate.envers.query.criteria.NotVersionsExpression; +import org.hibernate.envers.query.criteria.NullVersionsExpression; +import org.hibernate.envers.query.criteria.PropertyVersionsExpression; +import org.hibernate.envers.query.criteria.RelatedVersionsExpression; +import org.hibernate.envers.query.criteria.SimpleVersionsExpression; +import org.hibernate.envers.query.criteria.VersionsConjunction; +import org.hibernate.envers.query.criteria.VersionsCriterion; +import org.hibernate.envers.query.criteria.VersionsDisjunction; import org.hibernate.criterion.MatchMode; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedFieldVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedFieldVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedFieldVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; import java.util.ArrayList; import java.util.List; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/BetweenVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/BetweenVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/BetweenVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/CriteriaTools.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/CriteriaTools.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/CriteriaTools.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.RelationDescription; -import org.jboss.envers.entities.RelationType; -import org.jboss.envers.exception.VersionsException; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.RelationDescription; +import org.hibernate.envers.entities.RelationType; +import org.hibernate.envers.exception.VersionsException; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/ExtendableCriterion.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/ExtendableCriterion.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/ExtendableCriterion.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/IdentifierEqVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/IdentifierEqVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/IdentifierEqVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/InVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/InVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/InVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/LogicalVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/LogicalVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/LogicalVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NotNullVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NotNullVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NotNullVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.RelationDescription; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.RelationDescription; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NotVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NotVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NotVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NullVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NullVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/NullVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.RelationDescription; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.RelationDescription; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/PropertyVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/PropertyVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/PropertyVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RelatedVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RelatedVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RelatedVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.RelationDescription; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.RelationDescription; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RevisionVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RevisionVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RevisionVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/SimpleVersionsExpression.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/SimpleVersionsExpression.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/SimpleVersionsExpression.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.RelationDescription; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.RelationDescription; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsConjunction.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsConjunction.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsConjunction.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; import java.util.ArrayList; import java.util.List; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsCriterion.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsCriterion.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsCriterion.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsDisjunction.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsDisjunction.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/VersionsDisjunction.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.criteria; +package org.hibernate.envers.query.criteria; import java.util.ArrayList; import java.util.List; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.query.Parameters; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/AbstractVersionsQuery.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/AbstractVersionsQuery.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/AbstractVersionsQuery.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.impl; +package org.hibernate.envers.query.impl; import java.util.ArrayList; import java.util.HashMap; @@ -30,17 +30,17 @@ import javax.persistence.NoResultException; import javax.persistence.NonUniqueResultException; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.entities.EntityInstantiator; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.query.VersionsQuery; -import org.jboss.envers.query.criteria.VersionsCriterion; -import org.jboss.envers.query.order.VersionsOrder; -import org.jboss.envers.query.projection.VersionsProjection; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.Pair; -import org.jboss.envers.tools.Triple; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.entities.EntityInstantiator; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.query.VersionsQuery; +import org.hibernate.envers.query.criteria.VersionsCriterion; +import org.hibernate.envers.query.order.VersionsOrder; +import org.hibernate.envers.query.projection.VersionsProjection; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.Pair; +import org.hibernate.envers.tools.Triple; +import org.hibernate.envers.tools.query.QueryBuilder; import org.hibernate.CacheMode; import org.hibernate.FlushMode; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.impl; +package org.hibernate.envers.query.impl; import java.util.ArrayList; import java.util.List; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.query.criteria.VersionsCriterion; -import org.jboss.envers.reader.VersionsReaderImplementor; -import org.jboss.envers.tools.query.QueryBuilder; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.query.criteria.VersionsCriterion; +import org.hibernate.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/RevisionsOfEntityQuery.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/RevisionsOfEntityQuery.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/impl/RevisionsOfEntityQuery.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,18 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.impl; +package org.hibernate.envers.query.impl; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.query.criteria.VersionsCriterion; -import org.jboss.envers.reader.VersionsReaderImplementor; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.query.criteria.VersionsCriterion; +import org.hibernate.envers.reader.VersionsReaderImplementor; import org.hibernate.proxy.HibernateProxy; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/order/RevisionVersionsOrder.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/order/RevisionVersionsOrder.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/order/RevisionVersionsOrder.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.order; +package org.hibernate.envers.query.order; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.Pair; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.Pair; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/order/VersionsOrder.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/order/VersionsOrder.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/order/VersionsOrder.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.order; +package org.hibernate.envers.query.order; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.Pair; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.Pair; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/projection/RevisionVersionsProjection.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/projection/RevisionVersionsProjection.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/projection/RevisionVersionsProjection.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.projection; +package org.hibernate.envers.query.projection; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.Triple; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.Triple; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/projection/VersionsProjection.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/projection/VersionsProjection.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/projection/VersionsProjection.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.query.projection; +package org.hibernate.envers.query.projection; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.tools.Triple; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.tools.Triple; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/reader/FirstLevelCache.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/reader/FirstLevelCache.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/reader/FirstLevelCache.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.reader; +package org.hibernate.envers.reader; import java.util.Map; -import static org.jboss.envers.tools.Tools.newHashMap; -import org.jboss.envers.tools.Triple; -import static org.jboss.envers.tools.Triple.make; +import static org.hibernate.envers.tools.Tools.newHashMap; +import org.hibernate.envers.tools.Triple; +import static org.hibernate.envers.tools.Triple.make; /** * First level cache for versioned entities, versions reader-scoped. Each entity is uniquely identified by a Modified: core/trunk/envers/src/main/java/org/hibernate/envers/reader/VersionsReaderImpl.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/reader/VersionsReaderImpl.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/reader/VersionsReaderImpl.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,21 +21,21 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.reader; +package org.hibernate.envers.reader; import java.util.Date; import java.util.List; import javax.persistence.NoResultException; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.exception.NotVersionedException; -import org.jboss.envers.exception.RevisionDoesNotExistException; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.query.RevisionProperty; -import org.jboss.envers.query.VersionsQueryCreator; -import org.jboss.envers.query.VersionsRestrictions; -import static org.jboss.envers.tools.ArgumentsTools.checkNotNull; -import static org.jboss.envers.tools.ArgumentsTools.checkPositive; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.exception.NotVersionedException; +import org.hibernate.envers.exception.RevisionDoesNotExistException; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.query.RevisionProperty; +import org.hibernate.envers.query.VersionsQueryCreator; +import org.hibernate.envers.query.VersionsRestrictions; +import static org.hibernate.envers.tools.ArgumentsTools.checkNotNull; +import static org.hibernate.envers.tools.ArgumentsTools.checkPositive; import org.hibernate.NonUniqueResultException; import org.hibernate.Query; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/reader/VersionsReaderImplementor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/reader/VersionsReaderImplementor.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/reader/VersionsReaderImplementor.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.reader; +package org.hibernate.envers.reader; -import org.jboss.envers.VersionsReader; +import org.hibernate.envers.VersionsReader; import org.hibernate.Session; import org.hibernate.engine.SessionImplementor; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/DefaultRevisionInfoGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/DefaultRevisionInfoGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/DefaultRevisionInfoGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.revisioninfo; +package org.hibernate.envers.revisioninfo; -import org.jboss.envers.RevisionListener; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.RevisionListener; +import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.MappingException; import org.hibernate.Session; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoGenerator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoGenerator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoGenerator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.revisioninfo; +package org.hibernate.envers.revisioninfo; import org.hibernate.Session; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoNumberReader.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoNumberReader.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoNumberReader.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.revisioninfo; +package org.hibernate.envers.revisioninfo; -import org.jboss.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.property.Getter; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoQueryCreator.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoQueryCreator.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoQueryCreator.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.revisioninfo; +package org.hibernate.envers.revisioninfo; import java.util.Date; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/VersionsSync.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/VersionsSync.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/VersionsSync.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization; +package org.hibernate.envers.synchronization; import java.util.HashMap; import java.util.LinkedList; @@ -29,9 +29,9 @@ import java.util.Queue; import javax.transaction.Synchronization; -import org.jboss.envers.revisioninfo.RevisionInfoGenerator; -import org.jboss.envers.synchronization.work.VersionsWorkUnit; -import org.jboss.envers.tools.Pair; +import org.hibernate.envers.revisioninfo.RevisionInfoGenerator; +import org.hibernate.envers.synchronization.work.VersionsWorkUnit; +import org.hibernate.envers.tools.Pair; import org.hibernate.FlushMode; import org.hibernate.Session; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/VersionsSyncManager.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/VersionsSyncManager.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/VersionsSyncManager.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization; +package org.hibernate.envers.synchronization; import java.util.Map; -import org.jboss.envers.revisioninfo.RevisionInfoGenerator; -import org.jboss.envers.tools.ConcurrentReferenceHashMap; +import org.hibernate.envers.revisioninfo.RevisionInfoGenerator; +import org.hibernate.envers.tools.ConcurrentReferenceHashMap; import org.hibernate.Transaction; import org.hibernate.event.EventSource; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/AbstractVersionsWorkUnit.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/AbstractVersionsWorkUnit.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/AbstractVersionsWorkUnit.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization.work; +package org.hibernate.envers.synchronization.work; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; import org.hibernate.Session; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization.work; +package org.hibernate.envers.synchronization.work; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.VersionsConfiguration; import org.hibernate.Session; import org.hibernate.persister.entity.EntityPersister; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization.work; +package org.hibernate.envers.synchronization.work; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.VersionsConfiguration; import org.hibernate.Session; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization.work; +package org.hibernate.envers.synchronization.work; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.VersionsConfiguration; import org.hibernate.Session; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckDispatcher.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckDispatcher.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckDispatcher.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization.work; +package org.hibernate.envers.synchronization.work; /** * Visitor patter dispatcher. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckResult.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckResult.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckResult.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization.work; +package org.hibernate.envers.synchronization.work; /** * Possible outcomes of selecting which work unit to keep, in case there are two work units for the same entity Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckVisitor.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckVisitor.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/KeepCheckVisitor.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization.work; +package org.hibernate.envers.synchronization.work; /** * Visitor pattern visitor. All methods should be invoked on the first work unit. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/ModWorkUnit.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/ModWorkUnit.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/ModWorkUnit.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization.work; +package org.hibernate.envers.synchronization.work; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.jboss.envers.RevisionType; -import org.jboss.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.VersionsConfiguration; import org.hibernate.Session; import org.hibernate.persister.entity.EntityPersister; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/PersistentCollectionChangeWorkUnit.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/PersistentCollectionChangeWorkUnit.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/PersistentCollectionChangeWorkUnit.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization.work; +package org.hibernate.envers.synchronization.work; import java.io.Serializable; import java.util.List; import java.util.Map; -import org.jboss.envers.configuration.VersionsConfiguration; -import org.jboss.envers.configuration.VersionsEntitiesConfiguration; -import org.jboss.envers.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.configuration.VersionsConfiguration; +import org.hibernate.envers.configuration.VersionsEntitiesConfiguration; +import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; import org.hibernate.Session; import org.hibernate.collection.PersistentCollection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/VersionsWorkUnit.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/VersionsWorkUnit.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/work/VersionsWorkUnit.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.synchronization.work; +package org.hibernate.envers.synchronization.work; import org.hibernate.Session; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/ArgumentsTools.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/ArgumentsTools.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/ArgumentsTools.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools; +package org.hibernate.envers.tools; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/ArraysTools.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/ArraysTools.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/ArraysTools.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools; +package org.hibernate.envers.tools; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/ConcurrentReferenceHashMap.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/ConcurrentReferenceHashMap.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/ConcurrentReferenceHashMap.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -28,7 +28,7 @@ * http://creativecommons.org/licenses/publicdomain */ -package org.jboss.envers.tools; +package org.hibernate.envers.tools; import java.io.IOException; import java.io.Serializable; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/HibernateVersion.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/HibernateVersion.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/HibernateVersion.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools; +package org.hibernate.envers.tools; import org.hibernate.MappingException; import org.hibernate.cfg.Environment; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/MutableBoolean.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/MutableBoolean.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/MutableBoolean.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools; +package org.hibernate.envers.tools; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/MutableInteger.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/MutableInteger.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/MutableInteger.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools; +package org.hibernate.envers.tools; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/Pair.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/Pair.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/Pair.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools; +package org.hibernate.envers.tools; /** * A pair of objects. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/StringTools.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/StringTools.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/StringTools.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools; +package org.hibernate.envers.tools; import java.util.Iterator; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/Tools.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/Tools.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/Tools.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools; +package org.hibernate.envers.tools; import java.util.ArrayList; import java.util.HashMap; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/Triple.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/Triple.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/Triple.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools; +package org.hibernate.envers.tools; /** * A triple of objects. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/GraphDefiner.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/GraphDefiner.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/GraphDefiner.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.graph; +package org.hibernate.envers.tools.graph; import java.util.List; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/GraphTopologicalSort.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/GraphTopologicalSort.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/GraphTopologicalSort.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.graph; +package org.hibernate.envers.tools.graph; import java.util.ArrayList; import java.util.HashMap; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/TopologicalSort.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/TopologicalSort.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/TopologicalSort.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.graph; +package org.hibernate.envers.tools.graph; import java.util.ArrayList; import java.util.Collection; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/Vertex.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/Vertex.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/graph/Vertex.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.graph; +package org.hibernate.envers.tools.graph; import java.util.ArrayList; import java.util.List; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/log/YLog.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/log/YLog.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/log/YLog.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.log; +package org.hibernate.envers.tools.log; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.jboss.envers.exception.VersionsException; +import org.hibernate.envers.exception.VersionsException; /** * A simple logger facade which delegates through reflection to a logging delegate. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/log/YLogManager.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/log/YLogManager.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/log/YLogManager.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.log; +package org.hibernate.envers.tools.log; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.jboss.envers.exception.VersionsException; +import org.hibernate.envers.exception.VersionsException; /** * A class for creating logging facades either to loggers obtained from Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/query/Parameters.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/query/Parameters.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/query/Parameters.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.query; +package org.hibernate.envers.tools.query; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jboss.envers.tools.MutableBoolean; -import org.jboss.envers.tools.MutableInteger; +import org.hibernate.envers.tools.MutableBoolean; +import org.hibernate.envers.tools.MutableInteger; /** * Parameters of a query, built using {@link QueryBuilder}. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.query; +package org.hibernate.envers.tools.query; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.jboss.envers.tools.MutableInteger; -import org.jboss.envers.tools.Pair; -import org.jboss.envers.tools.StringTools; +import org.hibernate.envers.tools.MutableInteger; +import org.hibernate.envers.tools.Pair; +import org.hibernate.envers.tools.StringTools; /** * A class for incrementaly building a HQL query. Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/ReflectionTools.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/ReflectionTools.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/ReflectionTools.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.reflection; +package org.hibernate.envers.tools.reflection; import java.util.Map; -import org.jboss.envers.exception.VersionsException; -import org.jboss.envers.tools.ConcurrentReferenceHashMap; -import org.jboss.envers.tools.Pair; -import static org.jboss.envers.tools.Pair.make; +import org.hibernate.envers.exception.VersionsException; +import org.hibernate.envers.tools.ConcurrentReferenceHashMap; +import org.hibernate.envers.tools.Pair; +import static org.hibernate.envers.tools.Pair.make; import org.hibernate.property.BasicPropertyAccessor; import org.hibernate.property.Getter; Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YClass.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YClass.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YClass.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.reflection; +package org.hibernate.envers.tools.reflection; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; -import org.jboss.envers.exception.VersionsException; +import org.hibernate.envers.exception.VersionsException; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YMethodsAndClasses.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YMethodsAndClasses.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YMethodsAndClasses.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.reflection; +package org.hibernate.envers.tools.reflection; import java.lang.reflect.Method; -import org.jboss.envers.exception.VersionsException; +import org.hibernate.envers.exception.VersionsException; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YProperty.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YProperty.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YProperty.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.reflection; +package org.hibernate.envers.tools.reflection; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; -import org.jboss.envers.exception.VersionsException; +import org.hibernate.envers.exception.VersionsException; /** * @author Adam Warski (adam at warski dot org) Modified: core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YReflectionManager.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YReflectionManager.java 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/main/java/org/hibernate/envers/tools/reflection/YReflectionManager.java 2008-10-29 15:51:05 UTC (rev 15435) @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.jboss.envers.tools.reflection; +package org.hibernate.envers.tools.reflection; import java.lang.reflect.InvocationTargetException; -import org.jboss.envers.exception.VersionsException; +import org.hibernate.envers.exception.VersionsException; import org.hibernate.MappingException; import org.hibernate.cfg.Configuration; Copied: core/trunk/envers/src/test/java/org/hibernate/envers/envers (from rev 15426, core/trunk/envers/src/test/java/org/jboss/envers) Modified: core/trunk/envers/src/test/resources/hibernate.test.cfg.xml =================================================================== --- core/trunk/envers/src/test/resources/hibernate.test.cfg.xml 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/test/resources/hibernate.test.cfg.xml 2008-10-29 15:51:05 UTC (rev 15435) @@ -24,22 +24,22 @@ <property name="format_sql">true</property> <event type="post-insert"> - <listener class="org.jboss.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> </event> <event type="post-update"> - <listener class="org.jboss.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> </event> <event type="post-delete"> - <listener class="org.jboss.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> </event> <event type="pre-collection-update"> - <listener class="org.jboss.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> </event> <event type="pre-collection-remove"> - <listener class="org.jboss.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> </event> <event type="post-collection-recreate"> - <listener class="org.jboss.envers.event.VersionsEventListener" /> + <listener class="org.hibernate.envers.envers.event.VersionsEventListener" /> </event> </session-factory> </hibernate-configuration> \ No newline at end of file Modified: core/trunk/envers/src/test/resources/testng.xml =================================================================== --- core/trunk/envers/src/test/resources/testng.xml 2008-10-29 15:17:39 UTC (rev 15434) +++ core/trunk/envers/src/test/resources/testng.xml 2008-10-29 15:51:05 UTC (rev 15435) @@ -3,38 +3,38 @@ <suite name="Envers"> <test name="All"> <packages> - <package name="org.jboss.envers.test.integration.basic" /> - <package name="org.jboss.envers.test.integration.cache" /> - <package name="org.jboss.envers.test.integration.collection" /> - <package name="org.jboss.envers.test.integration.collection.mapkey" /> - <package name="org.jboss.envers.test.integration.components" /> - <package name="org.jboss.envers.test.integration.customtype" /> - <package name="org.jboss.envers.test.integration.data" /> - <package name="org.jboss.envers.test.integration.flush" /> - <package name="org.jboss.envers.test.integration.ids" /> - <package name="org.jboss.envers.test.integration.inheritance.single" /> - <package name="org.jboss.envers.test.integration.inheritance.single.childrelation" /> - <package name="org.jboss.envers.test.integration.inheritance.single.relation" /> - <package name="org.jboss.envers.test.integration.manytomany" /> - <package name="org.jboss.envers.test.integration.manytomany.ternary" /> - <package name="org.jboss.envers.test.integration.manytomany.unidirectional" /> - <package name="org.jboss.envers.test.integration.naming" /> - <package name="org.jboss.envers.test.integration.naming.ids" /> - <package name="org.jboss.envers.test.integration.notinsertable" /> - <package name="org.jboss.envers.test.integration.onetomany" /> - <package name="org.jboss.envers.test.integration.onetomany.detached" /> - <package name="org.jboss.envers.test.integration.onetoone.bidirectional" /> - <package name="org.jboss.envers.test.integration.onetoone.bidirectional.ids" /> - <package name="org.jboss.envers.test.integration.onetoone.unidirectional" /> - <package name="org.jboss.envers.test.integration.properties" /> - <package name="org.jboss.envers.test.integration.query" /> - <package name="org.jboss.envers.test.integration.query.ids" /> - <package name="org.jboss.envers.test.integration.reventity" /> - <package name="org.jboss.envers.test.integration.revfordate" /> - <package name="org.jboss.envers.test.integration.sameids" /> - <package name="org.jboss.envers.test.integration.secondary" /> - <package name="org.jboss.envers.test.integration.secondary.ids" /> - <package name="org.jboss.envers.test.integration.superclass" /> + <package name="org.hibernate.envers.envers.test.integration.basic" /> + <package name="org.hibernate.envers.envers.test.integration.cache" /> + <package name="org.hibernate.envers.envers.test.integration.collection" /> + <package name="org.hibernate.envers.envers.test.integration.collection.mapkey" /> + <package name="org.hibernate.envers.envers.test.integration.components" /> + <package name="org.hibernate.envers.envers.test.integration.customtype" /> + <package name="org.hibernate.envers.envers.test.integration.data" /> + <package name="org.hibernate.envers.envers.test.integration.flush" /> + <package name="org.hibernate.envers.envers.test.integration.ids" /> + <package name="org.hibernate.envers.envers.test.integration.inheritance.single" /> + <package name="org.hibernate.envers.envers.test.integration.inheritance.single.childrelation" /> + <package name="org.hibernate.envers.envers.test.integration.inheritance.single.relation" /> + <package name="org.hibernate.envers.envers.test.integration.manytomany" /> + <package name="org.hibernate.envers.envers.test.integration.manytomany.ternary" /> + <package name="org.hibernate.envers.envers.test.integration.manytomany.unidirectional" /> + <package name="org.hibernate.envers.envers.test.integration.naming" /> + <package name="org.hibernate.envers.envers.test.integration.naming.ids" /> + <package name="org.hibernate.envers.envers.test.integration.notinsertable" /> + <package name="org.hibernate.envers.envers.test.integration.onetomany" /> + <package name="org.hibernate.envers.envers.test.integration.onetomany.detached" /> + <package name="org.hibernate.envers.envers.test.integration.onetoone.bidirectional" /> + <package name="org.hibernate.envers.envers.test.integration.onetoone.bidirectional.ids" /> + <package name="org.hibernate.envers.envers.test.integration.onetoone.unidirectional" /> + <package name="org.hibernate.envers.envers.test.integration.properties" /> + <package name="org.hibernate.envers.envers.test.integration.query" /> + <package name="org.hibernate.envers.envers.test.integration.query.ids" /> + <package name="org.hibernate.envers.envers.test.integration.reventity" /> + <package name="org.hibernate.envers.envers.test.integration.revfordate" /> + <package name="org.hibernate.envers.envers.test.integration.sameids" /> + <package name="org.hibernate.envers.envers.test.integration.secondary" /> + <package name="org.hibernate.envers.envers.test.integration.secondary.ids" /> + <package name="org.hibernate.envers.envers.test.integration.superclass" /> </packages> </test> </suite> \ No newline at end of file

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15434 - in core/trunk/envers/src/main/java/org: jboss and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-29 11:17:39 -0400 (Wed, 29 Oct 2008) New Revision: 15434 Added: core/trunk/envers/src/main/java/org/hibernate/envers/ Removed: core/trunk/envers/src/main/java/org/jboss/envers/ Log: HHH-3351 : import envers as core module Copied: core/trunk/envers/src/main/java/org/hibernate/envers (from rev 15433, core/trunk/envers/src/main/java/org/jboss/envers)

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15433 - core/trunk/envers.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-29 10:59:03 -0400 (Wed, 29 Oct 2008) New Revision: 15433 Modified: core/trunk/envers/pom.xml Log: HHH-3351 : import envers as core module (testng setup) Modified: core/trunk/envers/pom.xml =================================================================== --- core/trunk/envers/pom.xml 2008-10-29 13:44:37 UTC (rev 15432) +++ core/trunk/envers/pom.xml 2008-10-29 14:59:03 UTC (rev 15433) @@ -36,7 +36,7 @@ <systemProperties> </systemProperties> <suiteXmlFiles> - <suiteXmlFile>resources/test/testng.xml</suiteXmlFile> + <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile> </suiteXmlFiles> </configuration> </plugin> @@ -91,6 +91,11 @@ <artifactId>hibernate</artifactId> </exclusion> <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + <exclusion> +  <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> </exclusion>

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15432 - core/trunk/envers.

by hibernate-commits＠lists.jboss.org

Author: adamw Date: 2008-10-29 09:44:37 -0400 (Wed, 29 Oct 2008) New Revision: 15432 Modified: core/trunk/envers/pom.xml Log: Excluding hibernate-validator from EM dependencies Modified: core/trunk/envers/pom.xml =================================================================== --- core/trunk/envers/pom.xml 2008-10-29 05:43:25 UTC (rev 15431) +++ core/trunk/envers/pom.xml 2008-10-29 13:44:37 UTC (rev 15432) @@ -91,6 +91,10 @@ <artifactId>hibernate</artifactId> </exclusion> <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </exclusion> + <exclusion> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> </exclusion>

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15431 - core/branches/Branch_3_2/etc.

by hibernate-commits＠lists.jboss.org

Author: gbadner Date: 2008-10-29 01:43:25 -0400 (Wed, 29 Oct 2008) New Revision: 15431 Modified: core/branches/Branch_3_2/etc/log4j.properties Log: HHH-2412 : Restore log4j.properties changed inadvertantly in the previous checkin Modified: core/branches/Branch_3_2/etc/log4j.properties =================================================================== --- core/branches/Branch_3_2/etc/log4j.properties 2008-10-29 05:38:54 UTC (rev 15430) +++ core/branches/Branch_3_2/etc/log4j.properties 2008-10-29 05:43:25 UTC (rev 15431) @@ -21,11 +21,11 @@ #log4j.logger.org.hibernate.hql.ast.AST=debug ### log just the SQL -log4j.logger.org.hibernate.SQL=debug +#log4j.logger.org.hibernate.SQL=debug ### log JDBC bind parameters ### -#log4j.logger.org.hibernate.type=info -log4j.logger.org.hibernate.type=debug +log4j.logger.org.hibernate.type=info +#log4j.logger.org.hibernate.type=debug ### log schema export/update ### log4j.logger.org.hibernate.tool.hbm2ddl=debug

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15430 - in core/branches/Branch_3_2: src/org/hibernate and 9 other directories.

by hibernate-commits＠lists.jboss.org

Author: gbadner Date: 2008-10-29 01:38:54 -0400 (Wed, 29 Oct 2008) New Revision: 15430 Added: core/branches/Branch_3_2/src/org/hibernate/exception/SQLStateExceptionConverterJDBC4.java core/branches/Branch_3_2/src/org/hibernate/exception/TransactionRollbackException.java core/branches/Branch_3_2/src/org/hibernate/jdbc/ResultSetWrapperProxy.java core/branches/Branch_3_2/src/org/hibernate/lob/BlobImplProxy.java core/branches/Branch_3_2/src/org/hibernate/lob/ClobImplProxy.java core/branches/Branch_3_2/src/org/hibernate/lob/LobCreator.java core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorFactory.java core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorImplJDBC3.java core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorImplJDBC4.java core/branches/Branch_3_2/src/org/hibernate/lob/SerializableBlobProxy.java core/branches/Branch_3_2/src/org/hibernate/lob/SerializableClobProxy.java core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractBlobFromLobCreatorTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractBlobTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractClobFromLobCreatorTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractClobTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorDefaultTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC3ConnRelOnCloseTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC3Test.java core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC4ConnRelOnCloseTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC4Test.java core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorDefaultTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC3ConnRelOnCloseTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC3Test.java core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC4ConnRelOnCloseTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC4Test.java Removed: core/branches/Branch_3_2/src/org/hibernate/jdbc/ResultSetWrapper.java Modified: core/branches/Branch_3_2/etc/log4j.properties core/branches/Branch_3_2/src/org/hibernate/Hibernate.java core/branches/Branch_3_2/src/org/hibernate/cfg/Environment.java core/branches/Branch_3_2/src/org/hibernate/cfg/Settings.java core/branches/Branch_3_2/src/org/hibernate/cfg/SettingsFactory.java core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java core/branches/Branch_3_2/src/org/hibernate/exception/SQLStateConverter.java core/branches/Branch_3_2/src/org/hibernate/jdbc/ColumnNameCache.java core/branches/Branch_3_2/src/org/hibernate/loader/Loader.java core/branches/Branch_3_2/src/org/hibernate/lob/BlobImpl.java core/branches/Branch_3_2/src/org/hibernate/lob/ClobImpl.java core/branches/Branch_3_2/src/org/hibernate/lob/SerializableBlob.java core/branches/Branch_3_2/src/org/hibernate/lob/SerializableClob.java core/branches/Branch_3_2/src/org/hibernate/type/BlobType.java core/branches/Branch_3_2/src/org/hibernate/type/ClobType.java core/branches/Branch_3_2/test/org/hibernate/test/AllTests.java core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobTest.java core/branches/Branch_3_2/test/org/hibernate/test/lob/LobHolder.java core/branches/Branch_3_2/test/org/hibernate/test/lob/MaterializedBlobType.java core/branches/Branch_3_2/test/org/hibernate/test/lob/SerializableData.java core/branches/Branch_3_2/test/org/hibernate/test/lob/SerializableTypeTest.java Log: HHH-2412 : Make Hibernate compilable with JDK 1.6 Modified: core/branches/Branch_3_2/etc/log4j.properties =================================================================== --- core/branches/Branch_3_2/etc/log4j.properties 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/etc/log4j.properties 2008-10-29 05:38:54 UTC (rev 15430) @@ -21,11 +21,11 @@ #log4j.logger.org.hibernate.hql.ast.AST=debug ### log just the SQL -#log4j.logger.org.hibernate.SQL=debug +log4j.logger.org.hibernate.SQL=debug ### log JDBC bind parameters ### -log4j.logger.org.hibernate.type=info -#log4j.logger.org.hibernate.type=debug +#log4j.logger.org.hibernate.type=info +log4j.logger.org.hibernate.type=debug ### log schema export/update ### log4j.logger.org.hibernate.tool.hbm2ddl=debug Modified: core/branches/Branch_3_2/src/org/hibernate/Hibernate.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/Hibernate.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/Hibernate.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -14,10 +14,8 @@ import org.hibernate.engine.HibernateIterator; import org.hibernate.intercept.FieldInterceptionHelper; import org.hibernate.intercept.FieldInterceptor; -import org.hibernate.lob.BlobImpl; -import org.hibernate.lob.ClobImpl; -import org.hibernate.lob.SerializableBlob; -import org.hibernate.lob.SerializableClob; +import org.hibernate.lob.LobCreator; +import org.hibernate.lob.LobCreatorFactory; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; import org.hibernate.type.AnyType; @@ -348,13 +346,30 @@ } /** + * If the setting for Environment#USE_CONNECTION_FOR_LOB_CREATION is true, then the + * returned LobCreator will use the Connection to create LOBs. If it is false, then + * the returned LobCreator will not use the Connection to create LOBs. + * + * If the property is not set, then the returned LobCreator will use the connection to + * create LOBs only if the JVM and JDBC driver support this JDBC4 functionality. + * + * (@see Environment#USE_CONNECTION_FOR_LOB_CREATION) + * + * @param session The session. + * @return the LobCreator + */ + public static LobCreator getLobCreator(Session session) { + return LobCreatorFactory.createLobCreator( session ); + } + + /** * Create a new <tt>Blob</tt>. The returned object will be initially immutable. * * @param bytes a byte array * @return the Blob */ public static Blob createBlob(byte[] bytes) { - return new SerializableBlob( new BlobImpl( bytes ) ); + return LobCreatorFactory.createLobCreator().createBlob( bytes ); } /** @@ -364,8 +379,8 @@ * @param length the number of bytes in the stream * @return the Blob */ - public static Blob createBlob(InputStream stream, int length) { - return new SerializableBlob( new BlobImpl( stream, length ) ); + public static Blob createBlob(InputStream stream, int length) throws HibernateException, IOException { + return LobCreatorFactory.createLobCreator().createBlob( stream, length ); } /** @@ -375,8 +390,8 @@ * @return the Blob * @throws IOException */ - public static Blob createBlob(InputStream stream) throws IOException { - return new SerializableBlob( new BlobImpl( stream, stream.available() ) ); + public static Blob createBlob(InputStream stream) throws HibernateException, IOException { + return LobCreatorFactory.createLobCreator().createBlob( stream, stream.available() ); } /** @@ -384,8 +399,8 @@ * * @param string a <tt>String</tt> */ - public static Clob createClob(String string) { - return new SerializableClob( new ClobImpl( string ) ); + public static Clob createClob(String string) throws HibernateException { + return LobCreatorFactory.createLobCreator().createClob( string ); } /** @@ -394,8 +409,8 @@ * @param reader a character stream * @param length the number of characters in the stream */ - public static Clob createClob(Reader reader, int length) { - return new SerializableClob( new ClobImpl( reader, length ) ); + public static Clob createClob(Reader reader, int length) throws HibernateException, IOException { + return LobCreatorFactory.createLobCreator().createClob( reader, length ); } /** Modified: core/branches/Branch_3_2/src/org/hibernate/cfg/Environment.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/cfg/Environment.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/cfg/Environment.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -111,11 +111,16 @@ * this property when using user supplied connections)</td> * </tr> * <tr> - * <td><tt>hibernate.jdbc.use_getGeneratedKeys</tt></td> + * <td><tt>hibernate.jdbc.use_get_generated_keys</tt></td> * <td>enable use of JDBC3 PreparedStatement.getGeneratedKeys() to retrieve * natively generated keys after insert. Requires JDBC3+ driver and JRE1.4+</td> * </tr> * <tr> + * <td><tt>hibernate.jdbc.use_connection_for_lob_creation</tt></td> + * <td>enable use of JDBC4 Connection.createBlob() and Connection.createClob() to + * create Blobs and Clobs. Requires JDBC4+ driver and JRE1.6+</td> + * </tr> + * <tr> * <td><tt>hibernate.hbm2ddl.auto</tt></td> * <td>enable auto DDL export</td> * </tr> @@ -262,6 +267,13 @@ */ public static final String USE_GET_GENERATED_KEYS = "hibernate.jdbc.use_get_generated_keys"; /** + * Tells the JDBC driver to attempt to create Blobs and Clobs using JDBC 4.0 + * Connection.createBlob() and Connection.createClob(), respectively. + * Performance may be better if this property is set to true and the underlying JDBC driver + * supports these Connection methods. + */ + public static final String USE_CONNECTION_FOR_LOB_CREATION = "hibernate.jdbc.use_connection_for_lob_creation"; + /** * Gives the JDBC driver a hint as to the number of rows that should be fetched from the database * when more rows are needed. If <tt>0</tt>, JDBC driver default settings will be used. */ @@ -478,6 +490,7 @@ private static final boolean JVM_HAS_TIMESTAMP_BUG; private static final boolean JVM_HAS_JDK14_TIMESTAMP; private static final boolean JVM_SUPPORTS_GET_GENERATED_KEYS; + private static final boolean JVM_SUPPORTS_JDBC4; private static final Properties GLOBAL_PROPERTIES; private static final HashMap ISOLATION_LEVELS = new HashMap(); @@ -578,6 +591,18 @@ JVM_SUPPORTS_GET_GENERATED_KEYS = getGeneratedKeysSupport; if (!JVM_SUPPORTS_GET_GENERATED_KEYS) log.info("JVM does not support Statement.getGeneratedKeys()"); + boolean jvmSupportsJDBC4; + try { + Connection.class.getMethod("createBlob", null); + Connection.class.getMethod("createClob", null); + jvmSupportsJDBC4 = true; + } + catch (NoSuchMethodException nsme) { + jvmSupportsJDBC4 = false; + } + JVM_SUPPORTS_JDBC4 = jvmSupportsJDBC4; + if (!JVM_SUPPORTS_JDBC4 ) log.info("JVM does not support JDBC4"); + boolean linkedHashSupport; try { Class.forName("java.util.LinkedHashSet"); @@ -633,6 +658,10 @@ return JVM_SUPPORTS_GET_GENERATED_KEYS; } + public static boolean jvmSupportsJDBC4() { + return JVM_SUPPORTS_JDBC4; + } + /** * Should we use streams to bind binary types to JDBC IN parameters. * Property <tt>hibernate.jdbc.use_streams_for_binary</tt>. Modified: core/branches/Branch_3_2/src/org/hibernate/cfg/Settings.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/cfg/Settings.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/cfg/Settings.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -32,6 +32,7 @@ private int defaultBatchFetchSize; private boolean scrollableResultSetsEnabled; private boolean getGeneratedKeysEnabled; + private boolean useConnectionForLobCreationEnabled; private String defaultSchemaName; private String defaultCatalogName; private Integer jdbcFetchSize; @@ -124,6 +125,10 @@ return getGeneratedKeysEnabled; } + public boolean isUseConnectionForLobCreationEnabled() { + return useConnectionForLobCreationEnabled; + } + public boolean isMinimalPutsEnabled() { return minimalPutsEnabled; } @@ -319,6 +324,10 @@ getGeneratedKeysEnabled = b; } + void setUseConnectionForLobCreationEnabled(boolean b) { + useConnectionForLobCreationEnabled = b; + } + void setJdbcFetchSize(Integer integer) { jdbcFetchSize = integer; } Modified: core/branches/Branch_3_2/src/org/hibernate/cfg/SettingsFactory.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/cfg/SettingsFactory.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/cfg/SettingsFactory.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -71,6 +71,7 @@ boolean metaSupportsBatchUpdates = false; boolean metaReportsDDLCausesTxnCommit = false; boolean metaReportsDDLInTxnSupported = true; + boolean driverConnectionHasLobCreationMethods = false; // 'hibernate.temp.use_jdbc_metadata_defaults' is a temporary magic value. // The need for it is intended to be alleviated with 3.3 developement, thus it is @@ -108,7 +109,31 @@ } } + if ( Environment.jvmSupportsJDBC4() ) { + try { + // this block doesn't actually use the DatabaseMetaData, but it does use the + // driver Connection Class to determine if methods are present. + Class c = conn.getClass(); + if ( Connection.class.equals( c.getMethod( "createBlob", null ).getDeclaringClass() ) || + Connection.class.equals( c.getMethod( "createClob", null ).getDeclaringClass() ) ) { + driverConnectionHasLobCreationMethods = false; + } + else { + // the driver's Connection class has all three methods; + // can't tell if the driver actually supports these methods w/o calling them, + // but don't want to actually create a LOB here. + driverConnectionHasLobCreationMethods = true; + } + } + catch (AbstractMethodError ame) { + driverConnectionHasLobCreationMethods = false; + } + catch (Exception e) { + driverConnectionHasLobCreationMethods = false; + } + } } + finally { connections.closeConnection(conn); } @@ -170,6 +195,10 @@ log.info("JDBC3 getGeneratedKeys(): " + enabledDisabled(useGetGeneratedKeys) ); settings.setGetGeneratedKeysEnabled(useGetGeneratedKeys); + boolean useConnectionForLobCreation = PropertiesHelper.getBoolean(Environment.USE_CONNECTION_FOR_LOB_CREATION, properties, driverConnectionHasLobCreationMethods); + log.info("JDBC4 Connection.createBlob() and Connection.createClob(): " + enabledDisabled(useConnectionForLobCreation) ); + settings.setUseConnectionForLobCreationEnabled(useConnectionForLobCreation); + Integer statementFetchSize = PropertiesHelper.getInteger(Environment.STATEMENT_FETCH_SIZE, properties); if (statementFetchSize!=null) log.info("JDBC result set fetch size: " + statementFetchSize); settings.setJdbcFetchSize(statementFetchSize); Modified: core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/dialect/Dialect.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,4 +1,27 @@ //$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.dialect; import java.sql.CallableStatement; @@ -29,6 +52,7 @@ import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.exception.SQLStateConverter; import org.hibernate.exception.ViolatedConstraintNameExtracter; +import org.hibernate.exception.SQLStateExceptionConverterJDBC4; import org.hibernate.id.IdentityGenerator; import org.hibernate.id.SequenceGenerator; import org.hibernate.id.TableHiLoGenerator; @@ -1181,9 +1205,14 @@ */ public SQLExceptionConverter buildSQLExceptionConverter() { // The default SQLExceptionConverter for all dialects is based on SQLState - // since SQLErrorCode is extremely vendor-specific. Specific Dialects + // since SQLErrorCode is extremely vendor-specific. If JDBC4 is supported, + // then the default SQLExceptionConverter will convert based on JDBC4 + // SQLException if the SQLState is not recognized. Specific Dialects // may override to return whatever is most appropriate for that vendor. - return new SQLStateConverter( getViolatedConstraintNameExtracter() ); + return ( Environment.jvmSupportsJDBC4() ? + new SQLStateExceptionConverterJDBC4( getViolatedConstraintNameExtracter() ) : + new SQLStateConverter( getViolatedConstraintNameExtracter() ) + ); } private static final ViolatedConstraintNameExtracter EXTRACTER = new ViolatedConstraintNameExtracter() { Modified: core/branches/Branch_3_2/src/org/hibernate/exception/SQLStateConverter.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/exception/SQLStateConverter.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/exception/SQLStateConverter.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -24,6 +24,7 @@ private static final Set DATA_CATEGORIES = new HashSet(); private static final Set INTEGRITY_VIOLATION_CATEGORIES = new HashSet(); private static final Set CONNECTION_CATEGORIES = new HashSet(); + private static final Set TRANSACTION_ROLLBACK_CATEGORIES = new HashSet(); static { SQL_GRAMMAR_CATEGORIES.add( "07" ); @@ -42,12 +43,19 @@ INTEGRITY_VIOLATION_CATEGORIES.add( "44" ); CONNECTION_CATEGORIES.add( "08" ); + CONNECTION_CATEGORIES.add( "28" ); + + TRANSACTION_ROLLBACK_CATEGORIES.add( "40" ); } public SQLStateConverter(ViolatedConstraintNameExtracter extracter) { this.extracter = extracter; } + protected String getViolatedConstraintName(SQLException sqlException) { + return extracter.extractConstraintName( sqlException ); + } + /** * Convert the given SQLException into Hibernate's JDBCException hierarchy. * @@ -67,7 +75,7 @@ return new SQLGrammarException( message, sqlException, sql ); } else if ( INTEGRITY_VIOLATION_CATEGORIES.contains( sqlStateClassCode ) ) { - String constraintName = extracter.extractConstraintName( sqlException ); + String constraintName = getViolatedConstraintName( sqlException ); return new ConstraintViolationException( message, sqlException, sql, constraintName ); } else if ( CONNECTION_CATEGORIES.contains( sqlStateClassCode ) ) { @@ -76,6 +84,9 @@ else if ( DATA_CATEGORIES.contains( sqlStateClassCode ) ) { return new DataException( message, sqlException, sql ); } + else if ( TRANSACTION_ROLLBACK_CATEGORIES.contains( sqlStateClassCode ) ) { + return new TransactionRollbackException( message, sqlException, sql ); + } } if ( "40001".equals( sqlState ) ) { Added: core/branches/Branch_3_2/src/org/hibernate/exception/SQLStateExceptionConverterJDBC4.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/exception/SQLStateExceptionConverterJDBC4.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/exception/SQLStateExceptionConverterJDBC4.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,87 @@ +// $Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.exception; + +import org.hibernate.JDBCException; + +import java.sql.SQLException; + +/** + * A SQLExceptionConverter implementation which performs converion based on + * the underlying SQLState. Interpretation of a SQL error based on SQLState + * is not nearly as accurate as using the ErrorCode (which is, however, vendor- + * specific). Use of a ErrorCode-based converter should be preferred approach + * for converting/interpreting SQLExceptions. + * + * @author Gail Badner + */ +public class SQLStateExceptionConverterJDBC4 extends SQLStateConverter { + + public SQLStateExceptionConverterJDBC4(ViolatedConstraintNameExtracter extracter) { + super( extracter ); + } + + /** + * Convert the given SQLException into Hibernate's JDBCException hierarchy. + * + * @param sqlException The SQLException to be converted. + * @param message An optional error message. + * @param sql Optionally, the sql being performed when the exception occurred. + * @return The resulting JDBCException. + */ + public JDBCException convert(SQLException sqlException, String message, String sql) { + JDBCException jdbcException = super.convert( sqlException, message, sql ); + if ( !( jdbcException instanceof GenericJDBCException) ) { + return jdbcException; + } + + try { + if ( Class.forName( "java.sql.SQLIntegrityConstraintViolationException" ).isInstance( sqlException ) ) { + String constraintName = getViolatedConstraintName( sqlException ); + return new ConstraintViolationException( message, sqlException, sql, constraintName ); + } + else if ( Class.forName( "java.sql.SQLTransactionRollbackException" ).isInstance( sqlException ) ) { + return new TransactionRollbackException( message, sqlException, sql ); + } + else if ( Class.forName( "java.sql.SQLClientInfoException" ).isInstance( sqlException ) || + Class.forName( "java.sql.SQLInvalidAuthorizationSpecException" ).isInstance( sqlException ) || + Class.forName( "java.sql.SQLNonTransientConnectionException" ).isInstance( sqlException ) || + Class.forName( "java.sql.SQLTransientConnectionException" ).isInstance( sqlException ) ) { + return new JDBCConnectionException( message, sqlException, sql ); + } + else if ( Class.forName( "java.sql.SQLSyntaxErrorException" ).isInstance( sqlException ) ) { + return new SQLGrammarException( message, sqlException, sql ); + } + else if ( Class.forName( "java.sql.SQLDataException" ).isInstance( sqlException ) || + Class.forName( "javax.sql.rowset.serial.SerialException" ).isInstance( sqlException ) ) { + return new DataException( message, sqlException, sql ); + } + } + catch ( ClassNotFoundException e ) { + // log because either config is messed up or there's a typo in a class name + } + return jdbcException; + } +} \ No newline at end of file Added: core/branches/Branch_3_2/src/org/hibernate/exception/TransactionRollbackException.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/exception/TransactionRollbackException.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/exception/TransactionRollbackException.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,59 @@ +// $Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.exception; + +import org.hibernate.JDBCException; + +import java.sql.SQLException; + +/** + * Implementation of JDBCException that indicates that the current statement + * was automatically rolled back by the database becuase of deadlock or other + * transaction serialization failures. + * + * @author Gail Badner + */ +public class TransactionRollbackException extends JDBCException { + /** + * Constructor for TransactionRollbackException. + * + * @param message Optional message. + * @param root The underlying exception. + */ + public TransactionRollbackException(String message, SQLException root) { + super( message, root ); + } + + /** + * Constructor for TransactionRollbackException. + * + * @param message Optional message. + * @param root The underlying exception. + * @param sql the SQL statement involved in the exception. + */ + public TransactionRollbackException(String message, SQLException root, String sql) { + super( message, root, sql ); + } +} \ No newline at end of file Modified: core/branches/Branch_3_2/src/org/hibernate/jdbc/ColumnNameCache.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/jdbc/ColumnNameCache.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/jdbc/ColumnNameCache.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,7 +1,31 @@ // $Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.jdbc; import java.sql.SQLException; +import java.sql.ResultSet; import java.util.HashMap; import java.util.Map; @@ -19,13 +43,13 @@ this.columnNameToIndexCache = new HashMap( columnCount ); } - public int getIndexForColumnName(String columnName, ResultSetWrapper rs)throws SQLException { + public int getIndexForColumnName(String columnName, ResultSet rs) throws SQLException { Integer cached = ( Integer ) columnNameToIndexCache.get( columnName ); if ( cached != null ) { return cached.intValue(); } else { - int index = rs.getTarget().findColumn( columnName ); + int index = rs.findColumn( columnName ); columnNameToIndexCache.put( columnName, new Integer(index) ); return index; } Deleted: core/branches/Branch_3_2/src/org/hibernate/jdbc/ResultSetWrapper.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/jdbc/ResultSetWrapper.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/jdbc/ResultSetWrapper.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,619 +0,0 @@ -// $Id$ -package org.hibernate.jdbc; - -import java.io.InputStream; -import java.io.Reader; -import java.math.BigDecimal; -import java.net.URL; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Date; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.Statement; -import java.sql.Time; -import java.sql.Timestamp; -import java.util.Calendar; -import java.util.Map; - -/** - * A ResultSet delegate, responsible for locally caching the columnName-to-columnIndex - * resolution that has been found to be inefficient in a few vendor's drivers (i.e., Oracle - * and Postgres). - * - * @author Steve Ebersole - */ -public class ResultSetWrapper implements ResultSet { - - private ResultSet rs; - private ColumnNameCache columnNameCache; - - public ResultSetWrapper(ResultSet resultSet, ColumnNameCache columnNameCache) { - this.rs = resultSet; - this.columnNameCache = columnNameCache; - } - - /*package*/ ResultSet getTarget() { - return rs; - } - - - // ResultSet impl ("overridden") ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - /** - * Overridden version to utilize local caching of the column indexes by name - * to improve performance for those drivers which are known to not support - * such caching by themselves. - * <p/> - * This implementation performs the caching based on the upper case version - * of the given column name. - * - * @param columnName The column name to resolve into an index. - * @return The column index corresponding to the given column name. - * @throws SQLException - if the ResultSet object does not contain - * columnName or a database access error occurs - */ - public int findColumn(String columnName) throws SQLException { - return columnNameCache.getIndexForColumnName( columnName, this ); - } - - public Array getArray(String colName) throws SQLException { - return rs.getArray( findColumn(colName) ); - } - - public void updateArray(String columnName, Array x) throws SQLException { - rs.updateArray( findColumn(columnName), x ); - } - - public InputStream getAsciiStream(String columnName) throws SQLException { - return rs.getAsciiStream( findColumn(columnName) ); - } - - public void updateAsciiStream(String columnName, InputStream x, int length) throws SQLException { - rs.updateAsciiStream( findColumn(columnName), x, length ); - } - - public BigDecimal getBigDecimal(String columnName) throws SQLException { - return rs.getBigDecimal( findColumn(columnName) ); - } - - public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException { - return rs.getBigDecimal( findColumn(columnName), scale ); - } - - public void updateBigDecimal(String columnName, BigDecimal x) throws SQLException { - rs.updateBigDecimal( findColumn(columnName), x ); - } - - public InputStream getBinaryStream(String columnName) throws SQLException { - return rs.getBinaryStream( findColumn(columnName) ); - } - - public void updateBinaryStream(String columnName, InputStream x, int length) throws SQLException { - rs.updateBinaryStream( findColumn(columnName), x, length ); - } - - public Blob getBlob(String columnName) throws SQLException { - return rs.getBlob( findColumn(columnName) ); - } - - public void updateBlob(String columnName, Blob x) throws SQLException { - rs.updateBlob( findColumn(columnName), x ); - } - - public boolean getBoolean(String columnName) throws SQLException { - return rs.getBoolean( findColumn(columnName) ); - } - - public void updateBoolean(String columnName, boolean x) throws SQLException { - rs.updateBoolean( findColumn(columnName), x ); - } - - public byte getByte(String columnName) throws SQLException { - return rs.getByte( findColumn(columnName) ); - } - - public void updateByte(String columnName, byte x) throws SQLException { - rs.updateByte( findColumn(columnName), x ); - } - - public byte[] getBytes(String columnName) throws SQLException { - return rs.getBytes( findColumn(columnName) ); - } - - public void updateBytes(String columnName, byte[] x) throws SQLException { - rs.updateBytes( findColumn(columnName), x ); - } - - public Reader getCharacterStream(String columnName) throws SQLException { - return rs.getCharacterStream( findColumn(columnName) ); - } - - public void updateCharacterStream(String columnName, Reader x, int length) throws SQLException { - rs.updateCharacterStream( findColumn(columnName), x, length ); - } - - public Clob getClob(String columnName) throws SQLException { - return rs.getClob( findColumn(columnName) ); - } - - public void updateClob(String columnName, Clob x) throws SQLException { - rs.updateClob( findColumn(columnName), x ); - } - - public Date getDate(String columnName) throws SQLException { - return rs.getDate( findColumn(columnName) ); - } - - public Date getDate(String columnName, Calendar cal) throws SQLException { - return rs.getDate( findColumn(columnName), cal ); - } - - public void updateDate(String columnName, Date x) throws SQLException { - rs.updateDate( findColumn(columnName), x ); - } - - public double getDouble(String columnName) throws SQLException { - return rs.getDouble( findColumn(columnName) ); - } - - public void updateDouble(String columnName, double x) throws SQLException { - rs.updateDouble( findColumn(columnName), x ); - } - - public float getFloat(String columnName) throws SQLException { - return rs.getFloat( findColumn(columnName) ); - } - - public void updateFloat(String columnName, float x) throws SQLException { - rs.updateFloat( findColumn(columnName), x ); - } - - public int getInt(String columnName) throws SQLException { - return rs.getInt( findColumn(columnName) ); - } - - public void updateInt(String columnName, int x) throws SQLException { - rs.updateInt( findColumn(columnName), x ); - } - - public long getLong(String columnName) throws SQLException { - return rs.getLong( findColumn(columnName) ); - } - - public void updateLong(String columnName, long x) throws SQLException { - rs.updateLong( findColumn(columnName), x ); - } - - public Object getObject(String columnName) throws SQLException { - return rs.getObject( findColumn(columnName) ); - } - - public Object getObject(String columnName, Map map) throws SQLException { - return rs.getObject( findColumn(columnName), map ); - } - - public void updateObject(String columnName, Object x) throws SQLException { - rs.updateObject( findColumn(columnName), x ); - } - - public void updateObject(String columnName, Object x, int scale) throws SQLException { - rs.updateObject( findColumn(columnName), x, scale ); - } - - public Ref getRef(String columnName) throws SQLException { - return rs.getRef( findColumn(columnName) ); - } - - public void updateRef(String columnName, Ref x) throws SQLException { - rs.updateRef( findColumn(columnName), x ); - } - - public short getShort(String columnName) throws SQLException { - return rs.getShort( findColumn(columnName) ); - } - - public void updateShort(String columnName, short x) throws SQLException { - rs.updateShort( findColumn(columnName), x ); - } - - public String getString(String columnName) throws SQLException { - return rs.getString( findColumn(columnName) ); - } - - public void updateString(String columnName, String x) throws SQLException { - rs.updateString( findColumn(columnName), x ); - } - - public Time getTime(String columnName) throws SQLException { - return rs.getTime( findColumn(columnName) ); - } - - public Time getTime(String columnName, Calendar cal) throws SQLException { - return rs.getTime( findColumn(columnName), cal ); - } - - public void updateTime(String columnName, Time x) throws SQLException { - rs.updateTime( findColumn(columnName), x ); - } - - public Timestamp getTimestamp(String columnName) throws SQLException { - return rs.getTimestamp( findColumn(columnName) ); - } - - public void updateTimestamp(String columnName, Timestamp x) throws SQLException { - rs.updateTimestamp( findColumn(columnName), x ); - } - - public Timestamp getTimestamp(String columnName, Calendar cal) throws SQLException { - return rs.getTimestamp( findColumn(columnName), cal ); - } - - public InputStream getUnicodeStream(String columnName) throws SQLException { - return rs.getUnicodeStream( findColumn(columnName) ); - } - - public URL getURL(String columnName) throws SQLException { - return rs.getURL( findColumn(columnName) ); - } - - public void updateNull(String columnName) throws SQLException { - rs.updateNull( findColumn(columnName) ); - } - - - // ResultSet impl (delegated) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - public int getConcurrency() throws SQLException { - return rs.getConcurrency(); - } - - public int getFetchDirection() throws SQLException { - return rs.getFetchDirection(); - } - - public int getFetchSize() throws SQLException { - return rs.getFetchSize(); - } - - public int getRow() throws SQLException { - return rs.getRow(); - } - - public int getType() throws SQLException { - return rs.getType(); - } - - public void afterLast() throws SQLException { - rs.afterLast(); - } - - public void beforeFirst() throws SQLException { - rs.beforeFirst(); - } - - public void cancelRowUpdates() throws SQLException { - rs.cancelRowUpdates(); - } - - public void clearWarnings() throws SQLException { - rs.clearWarnings(); - } - - public void close() throws SQLException { - rs.close(); - } - - public void deleteRow() throws SQLException { - rs.deleteRow(); - } - - public void insertRow() throws SQLException { - rs.insertRow(); - } - - public void moveToCurrentRow() throws SQLException { - rs.moveToCurrentRow(); - } - - public void moveToInsertRow() throws SQLException { - rs.moveToInsertRow(); - } - - public void refreshRow() throws SQLException { - rs.refreshRow(); - } - - public void updateRow() throws SQLException { - rs.updateRow(); - } - - public boolean first() throws SQLException { - return rs.first(); - } - - public boolean isAfterLast() throws SQLException { - return rs.isAfterLast(); - } - - public boolean isBeforeFirst() throws SQLException { - return rs.isBeforeFirst(); - } - - public boolean isFirst() throws SQLException { - return rs.isFirst(); - } - - public boolean isLast() throws SQLException { - return rs.isLast(); - } - - public boolean last() throws SQLException { - return rs.last(); - } - - public boolean next() throws SQLException { - return rs.next(); - } - - public boolean previous() throws SQLException { - return rs.previous(); - } - - public boolean rowDeleted() throws SQLException { - return rs.rowDeleted(); - } - - public boolean rowInserted() throws SQLException { - return rs.rowInserted(); - } - - public boolean rowUpdated() throws SQLException { - return rs.rowUpdated(); - } - - public boolean wasNull() throws SQLException { - return rs.wasNull(); - } - - public byte getByte(int columnIndex) throws SQLException { - return rs.getByte(columnIndex); - } - - public double getDouble(int columnIndex) throws SQLException { - return rs.getDouble(columnIndex); - } - - public float getFloat(int columnIndex) throws SQLException { - return rs.getFloat(columnIndex); - } - - public int getInt(int columnIndex) throws SQLException { - return rs.getInt(columnIndex); - } - - public long getLong(int columnIndex) throws SQLException { - return rs.getLong(columnIndex); - } - - public short getShort(int columnIndex) throws SQLException { - return rs.getShort(columnIndex); - } - - public void setFetchDirection(int direction) throws SQLException { - rs.setFetchDirection(direction); - } - - public void setFetchSize(int rows) throws SQLException { - rs.setFetchSize(rows); - } - - public void updateNull(int columnIndex) throws SQLException { - rs.updateNull(columnIndex); - } - - public boolean absolute(int row) throws SQLException { - return rs.absolute(row); - } - - public boolean getBoolean(int columnIndex) throws SQLException { - return rs.getBoolean(columnIndex); - } - - public boolean relative(int rows) throws SQLException { - return rs.relative(rows); - } - - public byte[] getBytes(int columnIndex) throws SQLException { - return rs.getBytes(columnIndex); - } - - public void updateByte(int columnIndex, byte x) throws SQLException { - rs.updateByte(columnIndex, x); - } - - public void updateDouble(int columnIndex, double x) throws SQLException { - rs.updateDouble(columnIndex, x); - } - - public void updateFloat(int columnIndex, float x) throws SQLException { - rs.updateFloat(columnIndex, x); - } - - public void updateInt(int columnIndex, int x) throws SQLException { - rs.updateInt(columnIndex, x); - } - - public void updateLong(int columnIndex, long x) throws SQLException { - rs.updateLong(columnIndex, x); - } - - public void updateShort(int columnIndex, short x) throws SQLException { - rs.updateShort(columnIndex, x); - } - - public void updateBoolean(int columnIndex, boolean x) throws SQLException { - rs.updateBoolean(columnIndex, x); - } - - public void updateBytes(int columnIndex, byte[] x) throws SQLException { - rs.updateBytes(columnIndex, x); - } - - public InputStream getAsciiStream(int columnIndex) throws SQLException { - return rs.getAsciiStream(columnIndex); - } - - public InputStream getBinaryStream(int columnIndex) throws SQLException { - return rs.getBinaryStream(columnIndex); - } - - public InputStream getUnicodeStream(int columnIndex) throws SQLException { - return rs.getUnicodeStream(columnIndex); - } - - public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException { - rs.updateAsciiStream(columnIndex, x, length); - } - - public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException { - rs.updateBinaryStream(columnIndex, x, length); - } - - public Reader getCharacterStream(int columnIndex) throws SQLException { - return rs.getCharacterStream(columnIndex); - } - - public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException { - rs.updateCharacterStream(columnIndex, x, length); - } - - public Object getObject(int columnIndex) throws SQLException { - return rs.getObject(columnIndex); - } - - public void updateObject(int columnIndex, Object x) throws SQLException { - rs.updateObject(columnIndex, x); - } - - public void updateObject(int columnIndex, Object x, int scale) throws SQLException { - rs.updateObject(columnIndex, x, scale); - } - - public String getCursorName() throws SQLException { - return rs.getCursorName(); - } - - public String getString(int columnIndex) throws SQLException { - return rs.getString(columnIndex); - } - - public void updateString(int columnIndex, String x) throws SQLException { - rs.updateString(columnIndex, x); - } - - public BigDecimal getBigDecimal(int columnIndex) throws SQLException { - return rs.getBigDecimal(columnIndex); - } - - public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException { - return rs.getBigDecimal(columnIndex, scale); - } - - public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException { - rs.updateBigDecimal(columnIndex, x); - } - - public URL getURL(int columnIndex) throws SQLException { - return rs.getURL(columnIndex); - } - - public Array getArray(int columnIndex) throws SQLException { - return rs.getArray(columnIndex); - } - - public void updateArray(int columnIndex, Array x) throws SQLException { - rs.updateArray(columnIndex, x); - } - - public Blob getBlob(int columnIndex) throws SQLException { - return rs.getBlob(columnIndex); - } - - public void updateBlob(int columnIndex, Blob x) throws SQLException { - rs.updateBlob(columnIndex, x); - } - - public Clob getClob(int columnIndex) throws SQLException { - return rs.getClob(columnIndex); - } - - public void updateClob(int columnIndex, Clob x) throws SQLException { - rs.updateClob(columnIndex, x); - } - - public Date getDate(int columnIndex) throws SQLException { - return rs.getDate(columnIndex); - } - - public void updateDate(int columnIndex, Date x) throws SQLException { - rs.updateDate(columnIndex, x); - } - - public Ref getRef(int columnIndex) throws SQLException { - return rs.getRef(columnIndex); - } - - public void updateRef(int columnIndex, Ref x) throws SQLException { - rs.updateRef(columnIndex, x); - } - - public ResultSetMetaData getMetaData() throws SQLException { - return rs.getMetaData(); - } - - public SQLWarning getWarnings() throws SQLException { - return rs.getWarnings(); - } - - public Statement getStatement() throws SQLException { - return rs.getStatement(); - } - - public Time getTime(int columnIndex) throws SQLException { - return rs.getTime(columnIndex); - } - - public void updateTime(int columnIndex, Time x) throws SQLException { - rs.updateTime(columnIndex, x); - } - - public Timestamp getTimestamp(int columnIndex) throws SQLException { - return rs.getTimestamp(columnIndex); - } - - public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException { - rs.updateTimestamp(columnIndex, x); - } - - public Object getObject(int columnIndex, Map map) throws SQLException { - return rs.getObject( columnIndex, map ); - } - - public Date getDate(int columnIndex, Calendar cal) throws SQLException { - return rs.getDate(columnIndex, cal); - } - - public Time getTime(int columnIndex, Calendar cal) throws SQLException { - return rs.getTime(columnIndex, cal); - } - - public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException { - return rs.getTimestamp(columnIndex, cal); - } -} - Added: core/branches/Branch_3_2/src/org/hibernate/jdbc/ResultSetWrapperProxy.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/jdbc/ResultSetWrapperProxy.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/jdbc/ResultSetWrapperProxy.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,170 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.jdbc; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.lang.reflect.InvocationTargetException; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.hibernate.util.JDBCExceptionReporter; + +/** + * A proxy for a ResultSet delegate, responsible for locally caching the + * columnName-to-columnIndex resolution that has been found to be inefficient + * in a few vendor's drivers (i.e., Oracle and Postgres). + * + * @author Gail Badner + */ +public class ResultSetWrapperProxy implements InvocationHandler { + + private static final Class[] PROXY_INTERFACES = new Class[] { ResultSet.class }; + private static final Log log = LogFactory.getLog( ResultSetWrapperProxy.class ); + + private final ResultSet rs; + private ColumnNameCache columnNameCache; + + /** + * Generates a proxy wrapping the ResultSet. + * + * @param resultSet The resultSet to wrap. + * @param columnNameCache The cache storing data for converting column names to column indexes. + * @return The generated proxy. + */ + public static ResultSet generateProxy(ResultSet resultSet, ColumnNameCache columnNameCache) { + return ( ResultSet ) Proxy.newProxyInstance( + getProxyClassLoader(), + PROXY_INTERFACES, + new ResultSetWrapperProxy( resultSet, columnNameCache ) + ); + } + + private ResultSetWrapperProxy(ResultSet resultSet, ColumnNameCache columnNameCache) { + this.rs = resultSet; + this.columnNameCache = columnNameCache; + } + + /** + * Overridden version to utilize local caching of the column indexes by name + * to improve performance for those drivers which are known to not support + * such caching by themselves. + * <p/> + * This implementation performs the caching based on the upper case version + * of the given column name. + * + * @param columnName The column name to resolve into an index. + * @return The column index corresponding to the given column name. + * @throws java.sql.SQLException - if the ResultSet object does not contain + * columnName or a database access error occurs + */ + public int findColumn(String columnName) throws SQLException { + return columnNameCache.getIndexForColumnName( columnName, rs ); + } + + /** + * {@inheritDoc} + */ + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + if ( isFirstArgColumnLabel( method, args ) ) { + try { + int columnIndex = findColumn( ( String ) args[0] ); + return invokeMethod( getMethodUsingColumnIndex( method ), getArgsUsingColumnIndex( args, columnIndex ) ); + } + catch ( SQLException ex ) { + StringBuffer buf = new StringBuffer() + .append( "Exception getting column index for column: [" ) + .append( args[0] ) + .append( "].\nReverting to using: [" ) + .append( args[ 0 ] ) + .append( "] as first argument for method: [" ) + .append( method ) + .append( "]" ); + JDBCExceptionReporter.logExceptions( ex, buf.toString() ); + } + catch ( NoSuchMethodException ex ) { + StringBuffer buf = new StringBuffer() + .append( "Exception switching from method: [" ) + .append( method ) + .append( "] to a method using the column index. Reverting to using: [" ) + .append( method ) + .append( "]" ); + if ( log.isWarnEnabled() ) { + log.warn( buf.toString() ); + } + } + } + return invokeMethod( method, args ); + } + + private boolean isFirstArgColumnLabel(Method method, Object args[]) { + return method.getParameterTypes().length > 0 && + method.getParameterTypes()[ 0 ].equals( String.class ) && + args.length == method.getParameterTypes().length && + String.class.isInstance( args[ 0 ] ) && + ( method.getName().startsWith( "get" ) || method.getName().startsWith( "update" ) ); + } + + private Method getMethodUsingColumnIndex(Method method) throws NoSuchMethodException { + Class actualParameterTypes[] = new Class[ method.getParameterTypes().length ]; + actualParameterTypes[0] = int.class; + System.arraycopy( method.getParameterTypes(), 1, actualParameterTypes, 1, method.getParameterTypes().length - 1 ); + return method.getDeclaringClass().getMethod( method.getName(), actualParameterTypes ); + } + + private Object[] getArgsUsingColumnIndex( Object[] args, int columnIndex ) { + Object actualArgs[] = new Object[ args.length ]; + actualArgs[0] = new Integer( columnIndex ); + System.arraycopy( args, 1, actualArgs, 1, args.length - 1 ); + return actualArgs; + } + + private Object invokeMethod( Method method, Object args[] ) throws Throwable { + try { + return method.invoke( rs, args ); + } + catch( InvocationTargetException e ) { + throw e.getTargetException(); + } + } + + /** + * Determines the appropriate class loader to which the generated proxy + * should be scoped. + * + * @return The class loader appropriate for proxy construction. + */ + public static ClassLoader getProxyClassLoader() { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + if ( cl == null ) { + cl = ResultSet.class.getClassLoader(); + } + return cl; + } +} \ No newline at end of file Modified: core/branches/Branch_3_2/src/org/hibernate/loader/Loader.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/loader/Loader.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/loader/Loader.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -48,7 +48,7 @@ import org.hibernate.impl.FetchingScrollableResultsImpl; import org.hibernate.impl.ScrollableResultsImpl; import org.hibernate.jdbc.ColumnNameCache; -import org.hibernate.jdbc.ResultSetWrapper; +import org.hibernate.jdbc.ResultSetWrapperProxy; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.Loadable; @@ -1814,7 +1814,7 @@ if ( session.getFactory().getSettings().isWrapResultSetsEnabled() ) { try { log.debug("Wrapping result set [" + rs + "]"); - return new ResultSetWrapper( rs, retreiveColumnNameToIndexCache( rs ) ); + return ResultSetWrapperProxy.generateProxy( rs, retreiveColumnNameToIndexCache( rs ) ); } catch(SQLException e) { log.info("Error wrapping result set", e); Modified: core/branches/Branch_3_2/src/org/hibernate/lob/BlobImpl.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/BlobImpl.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/lob/BlobImpl.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,113 +1,34 @@ //$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.sql.Blob; -import java.sql.SQLException; /** - * A dummy implementation of <tt>java.sql.Blob</tt> that - * may be used to insert new data into a BLOB. * @author Gavin King */ -public class BlobImpl implements Blob { - - private InputStream stream; - private int length; - private boolean needsReset = false; - - public BlobImpl(byte[] bytes) { - this.stream = new ByteArrayInputStream(bytes); - this.length = bytes.length; - } - - public BlobImpl(InputStream stream, int length) { - this.stream = stream; - this.length = length; - } - - /** - * @see java.sql.Blob#length() - */ - public long length() throws SQLException { - return length; - } - - /** - * @see java.sql.Blob#truncate(long) - */ - public void truncate(long pos) throws SQLException { - excep(); - } - - /** - * @see java.sql.Blob#getBytes(long, int) - */ - public byte[] getBytes(long pos, int len) throws SQLException { - excep(); return null; - } - - /** - * @see java.sql.Blob#setBytes(long, byte[]) - */ - public int setBytes(long pos, byte[] bytes) throws SQLException { - excep(); return 0; - } - - /** - * @see java.sql.Blob#setBytes(long, byte[], int, int) - */ - public int setBytes(long pos, byte[] bytes, int i, int j) - throws SQLException { - excep(); return 0; - } - - /** - * @see java.sql.Blob#position(byte[], long) - */ - public long position(byte[] bytes, long pos) throws SQLException { - excep(); return 0; - } - - /** - * @see java.sql.Blob#getBinaryStream() - */ - public InputStream getBinaryStream() throws SQLException { - try { - if (needsReset) stream.reset(); - } - catch (IOException ioe) { - throw new SQLException("could not reset reader"); - } - needsReset = true; - return stream; - } - - /** - * @see java.sql.Blob#setBinaryStream(long) - */ - public OutputStream setBinaryStream(long pos) throws SQLException { - excep(); return null; - } - - /** - * @see java.sql.Blob#position(Blob, long) - */ - public long position(Blob blob, long pos) throws SQLException { - excep(); return 0; - } - - private static void excep() { - throw new UnsupportedOperationException("Blob may not be manipulated from creating session"); - } - -} - - - - - - +public interface BlobImpl extends Blob { +} \ No newline at end of file Added: core/branches/Branch_3_2/src/org/hibernate/lob/BlobImplProxy.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/BlobImplProxy.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/lob/BlobImplProxy.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,148 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.sql.Blob; +import java.sql.SQLException; +import java.io.InputStream; +import java.io.ByteArrayInputStream; +import java.io.IOException; + +/** + * A proxy for a dummy implementation of <tt>java.sql.Blob</tt> that + * is used to insert new data into a Blob when the Connection is not used + * for creating new Blobs. + * + * This implementation provides minimal functionality for creating a + * new Blob. The only operations that are supported are {@link #length()} + * and {@link #getBinaryStream()}. All other operations will throw + * UnsupportedOperationException. + * + * The proxy extends BlobImpl so that it can be distinguished from a Blob. + * + * @author Gail Badner + */ +public class BlobImplProxy implements InvocationHandler { + + private static final Class[] PROXY_INTERFACES = new Class[] { BlobImpl.class }; + + private InputStream stream; + private int length; + private boolean needsReset = false; + + /** + * Generates a BlobImpl proxy using byte data. + * + * @param bytes The data to be created as a Blob. + * @return The generated proxy. + */ + public static Blob generateProxy(byte[] bytes) { + return ( Blob ) Proxy.newProxyInstance( + getProxyClassLoader(), + PROXY_INTERFACES, + new BlobImplProxy( bytes ) + ); + } + + /** + * Generates a BlobImpl proxy using a given number of bytes from an InputStream. + * + * @param stream The input stream of bytes to be created as a Blob. + * @param length The number of bytes from stream to be written to the Blob. + * @return The generated proxy. + */ + public static Blob generateProxy(InputStream stream, int length) { + return ( Blob ) Proxy.newProxyInstance( + getProxyClassLoader(), + PROXY_INTERFACES, + new BlobImplProxy( stream, length ) + ); + } + + private BlobImplProxy(byte[] bytes) { + this.stream = new ByteArrayInputStream(bytes); + this.length = bytes.length; + } + + private BlobImplProxy(InputStream stream, int length) { + this.stream = stream; + this.length = length; + } + + /** + * @see java.sql.Blob#length() + */ + public long length() throws SQLException { + return length; + } + + /** + * @see java.sql.Blob#getBinaryStream() + */ + public InputStream getBinaryStream() throws SQLException { + try { + if (needsReset) stream.reset(); + } + catch ( IOException ioe) { + throw new SQLException("could not reset reader"); + } + needsReset = true; + return stream; + } + + /** + * {@inheritDoc} + * + * @throws UnsupportedOperationException if any methods other than {@link #length()} + * or {@link #getBinaryStream} are invoked. + */ + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + if ( "length".equals( method.getName() ) ) { + return new Long( length() ); + } + if ( "getBinaryStream".equals( method.getName() ) && method.getParameterTypes().length == 0) { + return getBinaryStream(); + } + throw new UnsupportedOperationException("Blob may not be manipulated from creating session"); + } + + /** + * Determines the appropriate class loader to which the generated proxy + * should be scoped. + * + * @return The class loader appropriate for proxy construction. + */ + public static ClassLoader getProxyClassLoader() { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + if ( cl == null ) { + cl = BlobImpl.class.getClassLoader(); + } + return cl; + } +} \ No newline at end of file Modified: core/branches/Branch_3_2/src/org/hibernate/lob/ClobImpl.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/ClobImpl.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/lob/ClobImpl.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,137 +1,34 @@ //$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.io.StringReader; -import java.io.Writer; import java.sql.Clob; -import java.sql.SQLException; /** - * A dummy implementation of <tt>java.sql.Clob</tt> that - * may be used to insert new data into a CLOB. * @author Gavin King */ -public class ClobImpl implements Clob { - - private Reader reader; - private int length; - private boolean needsReset = false; - - public ClobImpl(String string) { - reader = new StringReader(string); - length = string.length(); - } - - public ClobImpl(Reader reader, int length) { - this.reader = reader; - this.length = length; - } - - /** - * @see java.sql.Clob#length() - */ - public long length() throws SQLException { - return length; - } - - /** - * @see java.sql.Clob#truncate(long) - */ - public void truncate(long pos) throws SQLException { - excep(); - } - - /** - * @see java.sql.Clob#getAsciiStream() - */ - public InputStream getAsciiStream() throws SQLException { - try { - if (needsReset) reader.reset(); - } - catch (IOException ioe) { - throw new SQLException("could not reset reader"); - } - needsReset = true; - return new ReaderInputStream(reader); - } - - /** - * @see java.sql.Clob#setAsciiStream(long) - */ - public OutputStream setAsciiStream(long pos) throws SQLException { - excep(); return null; - } - - /** - * @see java.sql.Clob#getCharacterStream() - */ - public Reader getCharacterStream() throws SQLException { - try { - if (needsReset) reader.reset(); - } - catch (IOException ioe) { - throw new SQLException("could not reset reader"); - } - needsReset = true; - return reader; - } - - /** - * @see java.sql.Clob#setCharacterStream(long) - */ - public Writer setCharacterStream(long pos) throws SQLException { - excep(); return null; - } - - /** - * @see java.sql.Clob#getSubString(long, int) - */ - public String getSubString(long pos, int len) throws SQLException { - excep(); return null; - } - - /** - * @see java.sql.Clob#setString(long, String) - */ - public int setString(long pos, String string) throws SQLException { - excep(); return 0; - } - - /** - * @see java.sql.Clob#setString(long, String, int, int) - */ - public int setString(long pos, String string, int i, int j) - throws SQLException { - excep(); return 0; - } - - /** - * @see java.sql.Clob#position(String, long) - */ - public long position(String string, long pos) throws SQLException { - excep(); return 0; - } - - /** - * @see java.sql.Clob#position(Clob, long) - */ - public long position(Clob colb, long pos) throws SQLException { - excep(); return 0; - } - - - private static void excep() { - throw new UnsupportedOperationException("Blob may not be manipulated from creating session"); - } - -} - - - - - - +public interface ClobImpl extends Clob { +} \ No newline at end of file Added: core/branches/Branch_3_2/src/org/hibernate/lob/ClobImplProxy.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/ClobImplProxy.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/lob/ClobImplProxy.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,165 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.sql.SQLException; +import java.sql.Clob; +import java.io.InputStream; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; + +/** + * A proxy for a dummy implementation of <tt>java.sql.Clob</tt> that + * is used to insert new data into a Clob when the Connection is not used + * for creating new Clobs. + * + * This implementation provides minimal functionality for creating a + * new Clob. The only operations that are supported are {@link #length()}, + * {@link #getAsciiStream()}, and {@link #getCharacterStream()}. All other + * operations will throw UnsupportedOperationException. + * + * The proxy extends ClobImpl so that it can be distinguished from a Clob. + * + * @author Gail Badner + */ +public class ClobImplProxy implements InvocationHandler { + + private static final Class[] PROXY_INTERFACES = new Class[] { ClobImpl.class }; + + private Reader reader; + private int length; + private boolean needsReset = false; + + /** + * Generates a BlobImpl proxy using a String. + * + * @param string The data to be created as a Clob. + * @return The generated proxy. + */ + public static Clob generateProxy(String string) { + return ( Clob ) Proxy.newProxyInstance( + getProxyClassLoader(), + PROXY_INTERFACES, + new ClobImplProxy( string ) + ); + } + + /** + * Generates a ClobImpl proxy using a given number of characters from a Reader. + * + * @param reader The Reader for character data to be created as a Clob. + * @param length The number of characters from Reader to be written to the Clob. + * @return The generated proxy. + */ + public static Clob generateProxy(Reader reader, int length) { + return ( Clob ) Proxy.newProxyInstance( + getProxyClassLoader(), + PROXY_INTERFACES, + new ClobImplProxy( reader, length ) + ); + } + + private ClobImplProxy(String string) { + reader = new StringReader(string); + length = string.length(); + } + + private ClobImplProxy(Reader reader, int length) { + this.reader = reader; + this.length = length; + } + + /** + * @see java.sql.Clob#length() + */ + public long length() throws SQLException { + return length; + } + + /** + * @see java.sql.Clob#getAsciiStream() + */ + public InputStream getAsciiStream() throws SQLException { + reset(); + return new ReaderInputStream(reader); + } + + /** + * @see java.sql.Clob#getCharacterStream() + */ + public Reader getCharacterStream() throws SQLException { + reset(); + return reader; + } + + /** + * {@inheritDoc} + * + * @throws UnsupportedOperationException if any methods other than {@link #length()}, + * {@link #getAsciiStream()}, or {@link #getCharacterStream()} are invoked. + */ + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + if ( "length".equals( method.getName() ) ) { + return new Long( length() ); + } + if ( "getAsciiStream".equals( method.getName() ) ) { + return getAsciiStream(); + } + if ( "getCharacterStream".equals( method.getName() ) ) { + return getCharacterStream(); + } + throw new UnsupportedOperationException("Clob may not be manipulated from creating session"); + } + + /** + * Determines the appropriate class loader to which the generated proxy + * should be scoped. + * + * @return The class loader appropriate for proxy construction. + */ + public static ClassLoader getProxyClassLoader() { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + if ( cl == null ) { + cl = ClobImpl.class.getClassLoader(); + } + return cl; + } + + + private void reset() throws SQLException { + try { + if (needsReset) reader.reset(); + } + catch (IOException ioe) { + throw new SQLException("could not reset reader"); + } + needsReset = true; + } +} \ No newline at end of file Added: core/branches/Branch_3_2/src/org/hibernate/lob/LobCreator.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/LobCreator.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/lob/LobCreator.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,96 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; + +import java.sql.Clob; +import java.sql.Blob; +import java.io.InputStream; +import java.io.Reader; +import java.io.IOException; + +import org.hibernate.HibernateException; + +/** + * This interface defines the API for creating Blobs and Clobs. + * + * @author Gail Badner + */ +public interface LobCreator { + + /** + * Returns a Blob object representing a SQL BLOB created from the given array of bytes. + * + * @param bytes The array of bytes to be written to this BLOB object. + * @return the created Blob + * @throws HibernateException if the Blob could not be created + */ + Blob createBlob(byte[] bytes) throws HibernateException; + + /** + * Returns a Blob object representing a SQL BLOB created from the given number of bytes + * from an InputStream. + * + * @param is The input stream of bytes to be written to this BLOB object. + * @param length The number of bytes from stream to be written to this BLOB object. + * @return the created Blob + * @throws HibernateException if the Blob could not be created + * @throws IOException if an I/O error occurs + */ + Blob createBlob(InputStream is, int length) throws HibernateException, IOException; + + + /** + * Returns a Blob object representing a SQL BLOB created from the available (is.available()) + * number of bytes from an InputStream. + * + * @param is The input stream of bytes to be written to this BLOB object. + * @return the created Blob + * @throws HibernateException if the Blob could not be created + * @throws IOException if an I/O error occurs + */ + Blob createBlob(InputStream is) throws HibernateException, IOException; + + /** + * Returns a Clob object representing a SQL CLOB created from the given String. + * + * @param string The String to be written to this CLOB object + * @throws HibernateException if the Clob could not be created + * @throws HibernateException + */ + Clob createClob(String string) throws HibernateException; + + /** + * Returns a Clob object representing a SQL CLOB created from the given number of + * characters from a character stream. + * + * @param reader The character stream to be written to this CLOB object. + * @param length The number of characters from reader to be written to this CLOB object. + * @return the created Clob + * @throws HibernateException if the Clob could not be created + * @throws IOException if an I/O error occurs + */ + Clob createClob(Reader reader, int length) throws HibernateException, IOException; +} \ No newline at end of file Added: core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorFactory.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorFactory.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorFactory.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,75 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; + +import org.hibernate.Session; +import org.hibernate.AssertionFailure; +import org.hibernate.engine.SessionFactoryImplementor; + +/** + * A factory for creating an instance of the appropriate LobCreator implementation. + * + * @author Gail Badner + */ +public class LobCreatorFactory { + + /** + * Creates an instance of a LobCreator that does not use the Connection to create LOBs. + * The returned LobCreator is appropriate for JVM and/or JDBC drivers that support JDBC3, + * but not JDBC4. + * + * @return the LobCreator + */ + public static LobCreator createLobCreator() { + return new LobCreatorImplJDBC3(); + } + + /** + * If the setting for Environment#USE_CONNECTION_FOR_LOB_CREATION is true, then the + * returned LobCreator will use the Connection to create LOBs. If it is false, then + * the returned LobCreator will not use the Connection to create LOBs. + * + * If the property is not set, then the returned LobCreator will use the connection to + * create LOBs only if the JVM and JDBC driver support this JDBC4 functionality. + * + * (@see Environment#USE_CONNECTION_FOR_LOB_CREATION) + * + * @param session The session. + * @return the LobCreator + */ + public static LobCreator createLobCreator(Session session) { + if ( session == null ) { + throw new AssertionFailure("session is null; use LobCreatorFactory.createLobCreator() instead."); + } + SessionFactoryImplementor sfi = ( SessionFactoryImplementor ) session.getSessionFactory(); + if ( sfi.getSettings().isUseConnectionForLobCreationEnabled() ) { + return new LobCreatorImplJDBC4( session ); + } + else { + return new LobCreatorImplJDBC3(); + } + } +} \ No newline at end of file Added: core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorImplJDBC3.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorImplJDBC3.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorImplJDBC3.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,79 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; + +import java.sql.Blob; +import java.sql.Clob; +import java.io.InputStream; +import java.io.Reader; +import java.io.IOException; + +/** + * A LobCreator implementation that can be used with JVMs and JDBC drivers that support JDBC3. + * + * @author Gail Badner + */ +public class LobCreatorImplJDBC3 implements LobCreator { + + /* package */ + LobCreatorImplJDBC3() { + } + + /** + * {@inheritDoc} + */ + public Blob createBlob(byte[] bytes) { + return SerializableBlobProxy.generateProxy( BlobImplProxy.generateProxy( bytes ) ); + } + + /** + * {@inheritDoc} + */ + public Blob createBlob(InputStream is, int length) { + return SerializableBlobProxy.generateProxy( BlobImplProxy.generateProxy( is, length ) ); + } + + /** + * {@inheritDoc} + */ + public Blob createBlob(InputStream is) throws IOException { + return SerializableBlobProxy.generateProxy( BlobImplProxy.generateProxy( is, is.available() ) ); + } + + /** + * {@inheritDoc} + */ + public Clob createClob(String string) { + return SerializableClobProxy.generateProxy( ClobImplProxy.generateProxy( string ) ); + } + + /** + * {@inheritDoc} + */ + public Clob createClob(Reader reader, int length) { + return SerializableClobProxy.generateProxy( ClobImplProxy.generateProxy( reader, length ) ); + } +} Added: core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorImplJDBC4.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorImplJDBC4.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/lob/LobCreatorImplJDBC4.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,195 @@ +// $Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; + +import java.sql.Blob; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.SQLException; +import java.io.InputStream; +import java.io.Reader; +import java.io.OutputStream; +import java.io.Writer; +import java.io.IOException; +import java.lang.reflect.Method; +import java.lang.reflect.InvocationTargetException; +import org.hibernate.Session; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Environment; +import org.hibernate.exception.JDBCExceptionHelper; +import org.hibernate.engine.SessionImplementor; + +/** + * A LobCreator implementation that can be used with JVMs and JDBC drivers that support JDBC4. + * + * @author Gail Badner + */ +public class LobCreatorImplJDBC4 implements LobCreator { + private final SessionImplementor session; + + /* package */ + LobCreatorImplJDBC4(Session session) { + this.session = ( SessionImplementor ) session; + } + + /** + * {@inheritDoc} + */ + public Blob createBlob(byte[] bytes) throws HibernateException { + Blob blob = createBlob(); + try { + blob.setBytes( 1, bytes ); + } + catch ( SQLException e ) { + throw JDBCExceptionHelper.convert( + session.getFactory().getSQLExceptionConverter(), + e, + "Exception invoking adding data to a Blob." + ); + } + return blob; + } + + /** + * {@inheritDoc} + */ + public Blob createBlob(InputStream is, int length) throws HibernateException, IOException { + Blob blob = createBlob(); + try { + OutputStream os = blob.setBinaryStream(1); + byte[] data = new byte[1]; + for ( int i = 0; i < length && is.read( data ) != -1; i++ ) { + os.write( data ); + } + os.flush(); + os.close(); + return blob; + } + catch ( SQLException e ) { + throw JDBCExceptionHelper.convert( + session.getFactory().getSQLExceptionConverter(), + e, + "Exception getting OutputStream to add data to a Blob." + ); + } + } + + /** + * {@inheritDoc} + */ + public Blob createBlob(InputStream is) throws HibernateException, IOException { + return createBlob( is, is.available() ); + } + + /** + * {@inheritDoc} + */ + public Clob createClob(String string) throws HibernateException { + Clob clob = createClob(); + try { + clob.setString( 1, string ); + return clob; + } + catch ( SQLException e ) { + throw JDBCExceptionHelper.convert( + session.getFactory().getSQLExceptionConverter(), + e, + "Exception adding a String to a Clob." + ); + } + } + + /** + * {@inheritDoc} + */ + public Clob createClob(Reader reader, int length) throws HibernateException, IOException { + Clob clob = createClob(); + try { + Writer writer = clob.setCharacterStream( 1 ); + char[] data = new char[1]; + for ( int i = 0; i < length && reader.read( data ) != -1; i++ ) { + writer.write( data ); + } + writer.flush(); + writer.close(); + return clob; + } + catch ( SQLException e ) { + throw JDBCExceptionHelper.convert( + session.getFactory().getSQLExceptionConverter(), + e, + "Exception getting OutputStream to add data to a Clob." + ); + } + } + + private Blob createBlob() { + final String CREATE_BLOB_METHOD_NAME = "createBlob"; + return ( Blob ) invokeConnectionMethod( CREATE_BLOB_METHOD_NAME ); + } + + private Clob createClob() { + final String CREATE_CLOB_METHOD_NAME = "createClob"; + return ( Clob ) invokeConnectionMethod( CREATE_CLOB_METHOD_NAME ); + } + + private Object invokeConnectionMethod(String methodName) throws HibernateException { + Connection connection = session.getJDBCContext().getConnectionManager().getConnection(); + final Object emptyArray[] = { }; + try { + Method method = Connection.class.getMethod( methodName, new Class[0] ); + Object object = method.invoke( connection, emptyArray ); + session.getJDBCContext().getConnectionManager().afterStatement(); + return object; + } + catch ( NoSuchMethodException e ) { + throw new HibernateException( getMethodString( connection, methodName ) + " not supported. Set " + Environment.USE_CONNECTION_FOR_LOB_CREATION + " to false.", e ); + } + catch ( AbstractMethodError e ) { + throw new HibernateException( "Implementation of " + getMethodString( connection, methodName ) + " not found. Set " + Environment.USE_CONNECTION_FOR_LOB_CREATION + " to false.", e ); + } + catch ( InvocationTargetException e ) { + if ( e.getTargetException() instanceof SQLException ) { + throw JDBCExceptionHelper.convert( + session.getFactory().getSQLExceptionConverter(), + ( SQLException ) e.getTargetException(), + "Exception invoking " + getMethodString( connection, methodName ) + ); + } + throw new HibernateException( "Exception invoking " + getMethodString( connection, methodName ), e.getTargetException() ); + } + catch ( IllegalAccessException e ) { + throw new HibernateException( "Cannot access " + getMethodString( connection, methodName ), e ); + } + } + + private String getMethodString(Connection connection, String methodName) { + return new StringBuffer() + .append( connection.getClass().getName() ) + .append('.') + .append( methodName ) + .append( "()" ).toString(); + } +} Modified: core/branches/Branch_3_2/src/org/hibernate/lob/SerializableBlob.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/SerializableBlob.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/lob/SerializableBlob.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,66 +1,35 @@ //$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; -import java.io.InputStream; -import java.io.OutputStream; import java.io.Serializable; import java.sql.Blob; -import java.sql.SQLException; /** * @author Gavin King */ -public class SerializableBlob implements Serializable, Blob { - - private transient final Blob blob; - - public SerializableBlob(Blob blob) { - this.blob = blob; - } - - public Blob getWrappedBlob() { - if ( blob==null ) { - throw new IllegalStateException("Blobs may not be accessed after serialization"); - } - else { - return blob; - } - } - - public long length() throws SQLException { - return getWrappedBlob().length(); - } - - public byte[] getBytes(long pos, int length) throws SQLException { - return getWrappedBlob().getBytes(pos, length); - } - - public InputStream getBinaryStream() throws SQLException { - return getWrappedBlob().getBinaryStream(); - } - - public long position(byte[] pattern, long start) throws SQLException { - return getWrappedBlob().position(pattern, start); - } - - public long position(Blob pattern, long start) throws SQLException { - return getWrappedBlob().position(pattern, start); - } - - public int setBytes(long pos, byte[] bytes) throws SQLException { - return getWrappedBlob().setBytes(pos, bytes); - } - - public int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLException { - return getWrappedBlob().setBytes(pos, bytes, offset, len); - } - - public OutputStream setBinaryStream(long pos) throws SQLException { - return getWrappedBlob().setBinaryStream(pos); - } - - public void truncate(long len) throws SQLException { - getWrappedBlob().truncate(len); - } - -} +public interface SerializableBlob extends Serializable, Blob { + public Blob getWrappedBlob(); +} \ No newline at end of file Added: core/branches/Branch_3_2/src/org/hibernate/lob/SerializableBlobProxy.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/SerializableBlobProxy.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/lob/SerializableBlobProxy.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,104 @@ +// $Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.lang.reflect.InvocationTargetException; +import java.sql.Blob; +import org.hibernate.HibernateException; + +/** + * A proxy for SerializableBlob objects which delegates all Blob methods to + * a wrapped Blob. + * + * @author Gail Badner + */ +public class SerializableBlobProxy implements InvocationHandler { + + private static final Class[] PROXY_INTERFACES = new Class[] { SerializableBlob.class }; + + private transient final Blob blob; + + /** + * Generates a SerializableBlob proxy wrapping the provided Blob object. + * + * @param blob The Blob to wrap. + * @return The generated proxy. + */ + public static Blob generateProxy(Blob blob) { + return ( Blob ) Proxy.newProxyInstance( + getProxyClassLoader(), + PROXY_INTERFACES, + new SerializableBlobProxy( blob ) + ); + } + + private SerializableBlobProxy(Blob blob) { + this.blob = blob; + } + + public Blob getWrappedBlob() { + if ( blob == null ) { + throw new IllegalStateException( "Blobs may not be accessed after serialization" ); + } + else { + return blob; + } + } + + /** + * {@inheritDoc} + */ + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + if ( "getWrappedBlob".equals( method.getName() ) ) { + return getWrappedBlob(); + } + try { + return method.invoke( getWrappedBlob(), args ); + } + catch( AbstractMethodError e ) { + throw new HibernateException("The JDBC driver does not implement the method: " + method, e); + } + catch (InvocationTargetException e ) { + throw e.getTargetException(); + } + } + + /** + * Determines the appropriate class loader to which the generated proxy + * should be scoped. + * + * @return The class loader appropriate for proxy construction. + */ + public static ClassLoader getProxyClassLoader() { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + if ( cl == null ) { + cl = SerializableBlob.class.getClassLoader(); + } + return cl; + } +} Modified: core/branches/Branch_3_2/src/org/hibernate/lob/SerializableClob.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/SerializableClob.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/lob/SerializableClob.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,76 +1,36 @@ //$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; import java.io.Serializable; -import java.io.Writer; import java.sql.Clob; -import java.sql.SQLException; /** * @author Gavin King */ -public class SerializableClob implements Serializable, Clob { +public interface SerializableClob extends Serializable, Clob { - private transient final Clob clob; - - public SerializableClob(Clob blob) { - this.clob = blob; - } - - public Clob getWrappedClob() { - if ( clob==null ) { - throw new IllegalStateException("Clobs may not be accessed after serialization"); - } - else { - return clob; - } - } - - public long length() throws SQLException { - return getWrappedClob().length(); - } - - public String getSubString(long pos, int length) throws SQLException { - return getWrappedClob().getSubString(pos, length); - } - - public Reader getCharacterStream() throws SQLException { - return getWrappedClob().getCharacterStream(); - } - - public InputStream getAsciiStream() throws SQLException { - return getWrappedClob().getAsciiStream(); - } - - public long position(String searchstr, long start) throws SQLException { - return getWrappedClob().position(searchstr, start); - } - - public long position(Clob searchstr, long start) throws SQLException { - return getWrappedClob().position(searchstr, start); - } - - public int setString(long pos, String str) throws SQLException { - return getWrappedClob().setString(pos, str); - } - - public int setString(long pos, String str, int offset, int len) throws SQLException { - return getWrappedClob().setString(pos, str, offset, len); - } - - public OutputStream setAsciiStream(long pos) throws SQLException { - return getWrappedClob().setAsciiStream(pos); - } - - public Writer setCharacterStream(long pos) throws SQLException { - return getWrappedClob().setCharacterStream(pos); - } - - public void truncate(long len) throws SQLException { - getWrappedClob().truncate(len); - } - + public Clob getWrappedClob(); } Added: core/branches/Branch_3_2/src/org/hibernate/lob/SerializableClobProxy.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/lob/SerializableClobProxy.java (rev 0) +++ core/branches/Branch_3_2/src/org/hibernate/lob/SerializableClobProxy.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,105 @@ +// $Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.lob; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.sql.Clob; + +import org.hibernate.HibernateException; + +/** + * A proxy for SerializableClob objects which delegates all Clob methods to + * a wrapped Clob. + * + * @author Gail Badner + */ +public class SerializableClobProxy implements InvocationHandler { + + private static final Class[] PROXY_INTERFACES = new Class[] { SerializableClob.class }; + + private transient final Clob clob; + + /** + * Generates a SerializableClob proxy wrapping the provided Clob object. + * + * @param clob The Clob to wrap. + * @return The generated proxy. + */ + public static Clob generateProxy(Clob clob) { + return ( Clob ) Proxy.newProxyInstance( + getProxyClassLoader(), + PROXY_INTERFACES, + new SerializableClobProxy( clob ) + ); + } + + private SerializableClobProxy(Clob clob) { + this.clob = clob; + } + + public Clob getWrappedClob() { + if ( clob==null ) { + throw new IllegalStateException("Clobs may not be accessed after serialization"); + } + else { + return clob; + } + } + + /** + * {@inheritDoc} + */ + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + if ( "getWrappedClob".equals( method.getName() ) ) { + return getWrappedClob(); + } + try { + return method.invoke( getWrappedClob(), args ); + } + catch( AbstractMethodError e ) { + throw new HibernateException("The JDBC driver does not implement the method: " + method, e); + } + catch( InvocationTargetException e ) { + throw e.getTargetException(); + } + } + + /** + * Determines the appropriate class loader to which the generated proxy + * should be scoped. + * + * @return The class loader appropriate for proxy construction. + */ + public static ClassLoader getProxyClassLoader() { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + if ( cl == null ) { + cl = Clob.class.getClassLoader(); + } + return cl; + } +} Modified: core/branches/Branch_3_2/src/org/hibernate/type/BlobType.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/type/BlobType.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/type/BlobType.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,4 +1,28 @@ //$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.type; import java.io.Serializable; @@ -18,6 +42,7 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.lob.BlobImpl; import org.hibernate.lob.SerializableBlob; +import org.hibernate.lob.SerializableBlobProxy; import org.hibernate.util.ArrayHelper; /** @@ -55,7 +80,7 @@ public Object get(ResultSet rs, String name) throws HibernateException, SQLException { Blob value = rs.getBlob(name); - return rs.wasNull() ? null : new SerializableBlob(value); + return rs.wasNull() ? null : SerializableBlobProxy.generateProxy(value); } public Class getReturnedClass() { Modified: core/branches/Branch_3_2/src/org/hibernate/type/ClobType.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/type/ClobType.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/src/org/hibernate/type/ClobType.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,4 +1,28 @@ //$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.type; import java.io.Serializable; @@ -19,6 +43,7 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.lob.ClobImpl; import org.hibernate.lob.SerializableClob; +import org.hibernate.lob.SerializableClobProxy; import org.hibernate.util.ArrayHelper; /** @@ -56,7 +81,7 @@ public Object get(ResultSet rs, String name) throws HibernateException, SQLException { Clob value = rs.getClob(name); - return rs.wasNull() ? null : new SerializableClob(value); + return rs.wasNull() ? null : SerializableClobProxy.generateProxy(value); } public Class getReturnedClass() { Modified: core/branches/Branch_3_2/test/org/hibernate/test/AllTests.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/AllTests.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/test/org/hibernate/test/AllTests.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -146,7 +146,17 @@ import org.hibernate.test.legacy.SQLLoaderTest; import org.hibernate.test.legacy.StatisticsTest; import org.hibernate.test.lob.BlobTest; +import org.hibernate.test.lob.BlobFromLobCreatorDefaultTest; +import org.hibernate.test.lob.BlobFromLobCreatorJDBC3ConnRelOnCloseTest; +import org.hibernate.test.lob.BlobFromLobCreatorJDBC3Test; +import org.hibernate.test.lob.BlobFromLobCreatorJDBC4ConnRelOnCloseTest; +import org.hibernate.test.lob.BlobFromLobCreatorJDBC4Test; import org.hibernate.test.lob.ClobTest; +import org.hibernate.test.lob.ClobFromLobCreatorDefaultTest; +import org.hibernate.test.lob.ClobFromLobCreatorJDBC3ConnRelOnCloseTest; +import org.hibernate.test.lob.ClobFromLobCreatorJDBC3Test; +import org.hibernate.test.lob.ClobFromLobCreatorJDBC4ConnRelOnCloseTest; +import org.hibernate.test.lob.ClobFromLobCreatorJDBC4Test; import org.hibernate.test.lob.SerializableTypeTest; import org.hibernate.test.manytomany.ManyToManyTest; import org.hibernate.test.manytomanyassociationclass.compositeid.ManyToManyAssociationClassCompositeIdTest; @@ -471,7 +481,17 @@ suite.addTest( AnyTypeTest.suite() ); suite.addTest( SerializableTypeTest.suite() ); suite.addTest( BlobTest.suite() ); + suite.addTest( BlobFromLobCreatorDefaultTest.suite() ); + suite.addTest( BlobFromLobCreatorJDBC3ConnRelOnCloseTest.suite() ); + suite.addTest( BlobFromLobCreatorJDBC3Test.suite() ); + suite.addTest( BlobFromLobCreatorJDBC4ConnRelOnCloseTest.suite() ); + suite.addTest( BlobFromLobCreatorJDBC4Test.suite() ); suite.addTest( ClobTest.suite() ); + suite.addTest( ClobFromLobCreatorDefaultTest.suite() ); + suite.addTest( ClobFromLobCreatorJDBC3ConnRelOnCloseTest.suite() ); + suite.addTest( ClobFromLobCreatorJDBC3Test.suite() ); + suite.addTest( ClobFromLobCreatorJDBC4ConnRelOnCloseTest.suite() ); + suite.addTest( ClobFromLobCreatorJDBC4Test.suite() ); suite.addTest( IdentifierPropertyReferencesTest.suite() ); suite.addTest( DeleteTransientEntityTest.suite() ); suite.addTest( UserCollectionTypeTest.suite() ); @@ -629,4 +649,4 @@ } } } -} \ No newline at end of file +} Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractBlobFromLobCreatorTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractBlobFromLobCreatorTest.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractBlobFromLobCreatorTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,161 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import java.sql.Blob; +import java.sql.SQLException; +import java.sql.Connection; +import java.io.IOException; +import java.io.ByteArrayInputStream; + +import org.hibernate.Hibernate; +import org.hibernate.Session; +import org.hibernate.AssertionFailure; +import org.hibernate.HibernateException; +import org.hibernate.SessionException; +import org.hibernate.lob.LobCreator; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.cfg.Environment; +import org.hibernate.cfg.Configuration; +import org.hibernate.dialect.Dialect; + +/** + * This class extends AbstractBlobTest to provide additional tests when + * using a LobCreator to create LOB locators. + * + * @author Gail Badner + */ +public abstract class AbstractBlobFromLobCreatorTest extends AbstractBlobTest { + + public AbstractBlobFromLobCreatorTest(String name) { + super( name ); + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + if ( getUseConnectionForLobCreationPropertyValue() == null ) { + cfg.setProperty( Environment.USE_CONNECTION_FOR_LOB_CREATION, "" ); + } + else { + cfg.setProperty( + Environment.USE_CONNECTION_FOR_LOB_CREATION, + String.valueOf( getUseConnectionForLobCreationPropertyValue().booleanValue() ) + ); + } + } + + public boolean appliesTo(Dialect dialect) { + if ( ! dialect.supportsExpectedLobUsagePattern() ) { + reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" ); + return false; + } + return true; + } + + protected abstract Boolean getUseConnectionForLobCreationPropertyValue(); + + protected Blob createBlobLocator(Session s, byte[] bytes) { + return Hibernate.getLobCreator( s ).createBlob( bytes ); + } + + protected Blob createBlobLocatorFromStream(Session s, byte[] bytes) throws IOException { + return Hibernate.getLobCreator( s ).createBlob( new ByteArrayInputStream( bytes ) ); + } + + protected Blob createBlobLocatorFromStreamUsingLength(Session s, byte[] bytes) throws IOException { + return Hibernate.getLobCreator( s ).createBlob( new ByteArrayInputStream( bytes ), bytes.length ); + } + + protected abstract Class getExpectedLobCreatorClass() throws SQLException ; + + public void testUseConnectionForLobCreationEnabledSetting() throws SQLException { + Boolean propVal = getUseConnectionForLobCreationPropertyValue(); + if ( propVal == null ) { + if ( jvmAndDriverSupportUseConnectionForLobCreation() != isUseConnectionForLobCreationEnabled() ) { + throw new AssertionFailure( "JVM and JDBC driver support is inconsistent with setting for using Connection to create LOBs." ); + + } + } + else { + if ( propVal.booleanValue() != isUseConnectionForLobCreationEnabled() ) { + throw new AssertionFailure( "Non-null Environment.USE_CONNECTION_FOR_LOB_CREATION value is inconstent with setting." ); + } + } + } + + public void testCorrectLobCreator() throws Exception { + Session s = openSession(); + LobCreator lobCreator = Hibernate.getLobCreator( s ); + assertEquals( getExpectedLobCreatorClass(), lobCreator.getClass() ); + s.close(); + } + + public void testGetLobCreatorWithNullSession() { + try { + Hibernate.getLobCreator( null ); + fail( "should have failed with null session" ); + } + catch ( AssertionFailure ex ) { + // expected + } + } + + public void testCreateBlobLocatorAfterSessionClose() throws Throwable { + Session s = openSession(); + s.close(); + byte[] bytes = buildRecursively( BLOB_SIZE, true ); + try { + createBlobLocator( s, bytes ); + if ( isUseConnectionForLobCreationEnabled() ) { + fail( "should have failed w/ SessionException" ); + } + } + catch ( SessionException e ) { + if ( ! isUseConnectionForLobCreationEnabled() ) { + fail( "should not have failed w/ SessionException" ); + } + } + } + + protected boolean isUseConnectionForLobCreationEnabled() { + return ( ( SessionFactoryImplementor ) getSessions() ).getSettings().isUseConnectionForLobCreationEnabled(); + } + + protected boolean jvmAndDriverSupportUseConnectionForLobCreation() throws SQLException { + if ( ! Environment.jvmSupportsJDBC4() ) { + return false; + } + Class c = ( ( SessionFactoryImplementor ) getSessions() ).getConnectionProvider().getConnection().getClass(); + try { + return !( Connection.class.equals( c.getMethod( "createBlob", new Class[0] ).getDeclaringClass() ) || + Connection.class.equals( c.getMethod( "createClob", new Class[0] ).getDeclaringClass() ) ); + } + catch ( NoSuchMethodException e ) { + return false; + } + } + +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractBlobTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractBlobTest.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractBlobTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,490 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import java.sql.Blob; +import java.sql.SQLException; +import java.io.IOException; + +import junit.framework.AssertionFailedError; + +import org.hibernate.LockMode; +import org.hibernate.Session; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.dialect.Dialect; +import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.util.ArrayHelper; + +/** + * Test various access scenarios for eager and lazy materialization + * of BLOB data, as well as bounded and unbounded materialization + * and mutation. + * + * @author Steve Ebersole + */ +public abstract class AbstractBlobTest extends DatabaseSpecificFunctionalTestCase { + public static final int BLOB_SIZE = 10000; + + public AbstractBlobTest(String name) { + super( name ); + } + + public String[] getMappings() { + return new String[] { "lob/LobMappings.hbm.xml" }; + } + + public boolean appliesTo(Dialect dialect) { + if ( ! dialect.supportsExpectedLobUsagePattern() ) { + reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" ); + return false; + } + return true; + } + + protected abstract Blob createBlobLocator(Session s, byte[] bytes); + + protected abstract Blob createBlobLocatorFromStream(Session s, byte[] bytes) throws IOException; + + protected abstract Blob createBlobLocatorFromStreamUsingLength(Session s, byte[] bytes) throws IOException ; + + protected boolean skipLobLocatorTests() throws SQLException { + return false; + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + // set connection pool size to 0 so that tests will always use a clean connection; + // this ensures that the test does not use LOB data left on the connection from + // prior to being returned to the connection pool. + cfg.setProperty( Environment.POOL_SIZE, "0" ); + // ConnectionReleaseMode.AFTER_TRANSACTION is the default for non-JTA connection. + // The Connection used for the unit tests is non-JTA. This setting for + // Environment.RELEASE_CONNECTIONS is just to make it explicit for these tests. + cfg.setProperty( Environment.RELEASE_CONNECTIONS, "after_transaction" ); + } + + public void testBoundedMaterializedBlobAccess() { + byte[] original = buildRecursively( BLOB_SIZE, true ); + byte[] changed = buildRecursively( BLOB_SIZE, false ); + + Session s = openSession(); + s.beginTransaction(); + LobHolder entity = new LobHolder(); + entity.setMaterializedBlob( original ); + s.save( entity ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( BLOB_SIZE, entity.getMaterializedBlob().length ); + assertEquals( original, entity.getMaterializedBlob() ); + entity.setMaterializedBlob( changed ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( BLOB_SIZE, entity.getMaterializedBlob().length ); + assertEquals( changed, entity.getMaterializedBlob() ); + s.delete( entity ); + s.getTransaction().commit(); + s.close(); + } + + public void testBoundedBlobLocatorAccess() throws Throwable { + if ( skipLobLocatorTests() ) { + return; + } + + byte[] original = buildRecursively( BLOB_SIZE, true ); + byte[] changed = buildRecursively( BLOB_SIZE, false ); + + Session s = openSession(); + s.beginTransaction(); + LobHolder entity = new LobHolder(); + entity.setBlobLocator( createBlobLocator( s, original ) ); + s.save( entity ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( original, extractData( entity.getBlobLocator() ) ); + s.getTransaction().commit(); + s.close(); + + // test mutation via setting the new blob data... + if ( supportsLobValueChangePropogation() ) { + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + entity.getBlobLocator().truncate( 1 ); + entity.getBlobLocator().setBytes( 1, changed ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + assertNotNull( entity.getBlobLocator() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( changed, extractData( entity.getBlobLocator() ) ); + entity.getBlobLocator().truncate( 1 ); + entity.getBlobLocator().setBytes( 1, original ); + s.getTransaction().commit(); + s.close(); + } + + // test mutation via supplying a new blob locator instance... + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + assertNotNull( entity.getBlobLocator() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( original, extractData( entity.getBlobLocator() ) ); + entity.setBlobLocator( createBlobLocator( s, changed ) ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( changed, extractData( entity.getBlobLocator() ) ); + s.delete( entity ); + s.getTransaction().commit(); + s.close(); + } + + public void testBoundedBlobLocatorAccessFromStream() throws Throwable { + if ( skipLobLocatorTests() ) { + return; + } + + byte[] original = buildRecursively( BLOB_SIZE, true ); + byte[] changed = buildRecursively( BLOB_SIZE, false ); + + Session s = openSession(); + s.beginTransaction(); + LobHolder entity = new LobHolder(); + entity.setBlobLocator( createBlobLocatorFromStream( s, original ) ); + s.save( entity ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( original, extractData( entity.getBlobLocator() ) ); + s.getTransaction().commit(); + s.close(); + + // test mutation via setting the new blob data... + if ( supportsLobValueChangePropogation() ) { + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + entity.getBlobLocator().truncate( 1 ); + entity.getBlobLocator().setBytes( 1, changed ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + assertNotNull( entity.getBlobLocator() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( changed, extractData( entity.getBlobLocator() ) ); + entity.getBlobLocator().truncate( 1 ); + entity.getBlobLocator().setBytes( 1, original ); + s.getTransaction().commit(); + s.close(); + } + + // test mutation via supplying a new blob locator instance... + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + assertNotNull( entity.getBlobLocator() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( original, extractData( entity.getBlobLocator() ) ); + entity.setBlobLocator( createBlobLocatorFromStream( s, changed ) ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( changed, extractData( entity.getBlobLocator() ) ); + s.delete( entity ); + s.getTransaction().commit(); + s.close(); + + } + + public void testBoundedBlobLocatorAccessFromStreamUsingLength() throws Throwable { + if ( skipLobLocatorTests() ) { + return; + } + + byte[] original = buildRecursively( BLOB_SIZE, true ); + byte[] changed = buildRecursively( BLOB_SIZE, false ); + + Session s = openSession(); + s.beginTransaction(); + LobHolder entity = new LobHolder(); + entity.setBlobLocator( createBlobLocatorFromStreamUsingLength( s, original ) ); + s.save( entity ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( original, extractData( entity.getBlobLocator() ) ); + s.getTransaction().commit(); + s.close(); + + // test mutation via setting the new blob data... + if ( supportsLobValueChangePropogation() ) { + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + entity.getBlobLocator().truncate( 1 ); + entity.getBlobLocator().setBytes( 1, changed ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + assertNotNull( entity.getBlobLocator() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( changed, extractData( entity.getBlobLocator() ) ); + entity.getBlobLocator().truncate( 1 ); + entity.getBlobLocator().setBytes( 1, original ); + s.getTransaction().commit(); + s.close(); + } + + // test mutation via supplying a new blob locator instance... + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + assertNotNull( entity.getBlobLocator() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( original, extractData( entity.getBlobLocator() ) ); + entity.setBlobLocator( createBlobLocatorFromStreamUsingLength( s, changed ) ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( changed, extractData( entity.getBlobLocator() ) ); + s.delete( entity ); + s.getTransaction().commit(); + s.close(); + + } + + public void testUnboundedBlobLocatorAccess() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + + // Note: unbounded mutation of the underlying lob data is completely + // unsupported; most databases would not allow such a construct anyway. + // Thus here we are only testing materialization... + + byte[] original = buildRecursively( BLOB_SIZE, true ); + + Session s = openSession(); + s.beginTransaction(); + LobHolder entity = new LobHolder(); + entity.setBlobLocator( createBlobLocator( s, original ) ); + s.save( entity ); + s.getTransaction().commit(); + s.close(); + + // load the entity with the blob locator, and close the session/transaction; + // at that point it is unbounded... + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + s.getTransaction().commit(); + s.close(); + + assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); + assertEquals( original, extractData( entity.getBlobLocator() ) ); + + s = openSession(); + s.beginTransaction(); + s.delete( entity ); + s.getTransaction().commit(); + s.close(); + } + + public void testCreateAndAccessLobLocatorInSessionNoTransaction() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + byte[] bytes = buildRecursively( BLOB_SIZE, true ); + Blob blob = createBlobLocator( s, bytes ); + assertEquals( BLOB_SIZE, blob.length() ); + assertEquals( bytes, extractData( blob ) ); + s.close(); + } + + public void testCreateAndAccessLobLocatorInTransaction() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + byte bytes[] = buildRecursively( BLOB_SIZE, true ); + Blob blob = createBlobLocator( s, bytes ); + assertEquals( BLOB_SIZE, blob.length() ); + assertEquals( bytes, extractData( blob ) ); + s.getTransaction().commit(); + s.close(); + } + + public void testCreateLobLocatorInTransactionAccessOutOfTransaction() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + byte bytes[] = buildRecursively( BLOB_SIZE, true ); + Blob blob = createBlobLocator( s, bytes ); + s.getTransaction().commit(); + assertEquals( BLOB_SIZE, blob.length() ); + assertEquals( bytes, extractData( blob ) ); + s.close(); + } + + public void testCreateLobLocatorInTransactionAccessInNextTransaction() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + byte bytes[] = buildRecursively( BLOB_SIZE, true ); + Blob blob = createBlobLocator( s, bytes ); + s.getTransaction().commit(); + s.getTransaction().begin(); + assertEquals( BLOB_SIZE, blob.length() ); + assertEquals( bytes, extractData( blob ) ); + s.getTransaction().commit(); + s.close(); + } + + public void testCreateLobLocatorInTransactionAccessAfterSessionClose() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + byte bytes[] = buildRecursively( BLOB_SIZE, true ); + Blob blob = createBlobLocator( s, bytes ); + s.getTransaction().commit(); + s.close(); + assertEquals( BLOB_SIZE, blob.length() ); + assertEquals( bytes, extractData( blob ) ); + } + + public void testCreateLobLocatorInTransactionAccessInNextSession() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + byte bytes[] = buildRecursively( BLOB_SIZE, true ); + Blob blob = createBlobLocator( s, bytes ); + s.getTransaction().commit(); + s.close(); + s = openSession(); + assertEquals( BLOB_SIZE, blob.length() ); + assertEquals( bytes, extractData( blob ) ); + s.close(); + } + + public void testCreateLobLocatorInTransactionAccessInNextSessionTransaction() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + byte bytes[] = buildRecursively( BLOB_SIZE, true ); + Blob blob = createBlobLocator( s, bytes ); + s.getTransaction().commit(); + s.close(); + s = openSession(); + s.getTransaction().begin(); + assertEquals( BLOB_SIZE, blob.length() ); + assertEquals( bytes, extractData( blob ) ); + s.getTransaction().commit(); + s.close(); + } + + protected byte[] extractData(Blob blob) throws Throwable { + byte bytesRead[] = new byte[ ( int ) blob.length() ]; + blob.getBinaryStream().read( bytesRead ); + return bytesRead; + } + + protected byte[] buildRecursively(int size, boolean on) { + byte[] data = new byte[size]; + data[0] = mask( on ); + for ( int i = 0; i < size; i++ ) { + data[i] = mask( on ); + on = !on; + } + return data; + } + + private byte mask(boolean on) { + return on ? ( byte ) 1 : ( byte ) 0; + } + + public static void assertEquals(byte[] val1, byte[] val2) { + if ( !ArrayHelper.isEquals( val1, val2 ) ) { + throw new AssertionFailedError( "byte arrays did not match" ); + } + } +} Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractClobFromLobCreatorTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractClobFromLobCreatorTest.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractClobFromLobCreatorTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,156 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import java.sql.SQLException; +import java.sql.Connection; +import java.sql.Clob; +import java.io.IOException; +import java.io.StringReader; + +import org.hibernate.Hibernate; +import org.hibernate.Session; +import org.hibernate.AssertionFailure; +import org.hibernate.SessionException; +import org.hibernate.lob.LobCreator; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.cfg.Environment; +import org.hibernate.cfg.Configuration; +import org.hibernate.dialect.Dialect; + +/** + * This class extends AbstractClobTest to provide additional tests when + * using a LobCreator to create LOB locators. + * + * @author Gail Badner + */ +public abstract class AbstractClobFromLobCreatorTest extends AbstractClobTest { + + public AbstractClobFromLobCreatorTest(String name) { + super( name ); + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + if ( getUseConnectionForLobCreationPropertyValue() == null ) { + cfg.setProperty( Environment.USE_CONNECTION_FOR_LOB_CREATION, "" ); + } + else { + cfg.setProperty( + Environment.USE_CONNECTION_FOR_LOB_CREATION, + String.valueOf( getUseConnectionForLobCreationPropertyValue().booleanValue() ) + ); + } + } + + public boolean appliesTo(Dialect dialect) { + if ( ! dialect.supportsExpectedLobUsagePattern() ) { + reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" ); + return false; + } + return true; + } + + protected abstract Boolean getUseConnectionForLobCreationPropertyValue(); + + protected Clob createClobLocator(Session s, String str) { + return Hibernate.getLobCreator( s ).createClob( str ); + } + + protected Clob createClobLocatorFromStreamUsingLength(Session s, String str) throws IOException { + return Hibernate.getLobCreator( s ).createClob( new StringReader( str ), str.length() ); + } + + protected abstract Class getExpectedLobCreatorClass() throws SQLException ; + + public void testUseConnectionForLobCreationEnabledSetting() throws SQLException { + Boolean propVal = getUseConnectionForLobCreationPropertyValue(); + if ( propVal == null ) { + if ( jvmAndDriverSupportUseConnectionForLobCreation() != isUseConnectionForLobCreationEnabled() ) { + throw new AssertionFailure( "JVM and JDBC driver support is inconsistent with setting for using Connection to create LOBs." ); + + } + } + else { + if ( propVal.booleanValue() != isUseConnectionForLobCreationEnabled() ) { + throw new AssertionFailure( "Non-null Environment.USE_CONNECTION_FOR_LOB_CREATION value is inconstent with setting." ); + } + } + } + + public void testCorrectLobCreator() throws Exception { + Session s = openSession(); + LobCreator lobCreator = Hibernate.getLobCreator( s ); + assertEquals( getExpectedLobCreatorClass(), lobCreator.getClass() ); + s.close(); + } + + public void testGetLobCreatorWithNullSession() { + try { + Hibernate.getLobCreator( null ); + fail( "should have failed with null session" ); + } + catch ( AssertionFailure ex ) { + // expected + } + } + + public void testCreateClobLocatorAfterSessionClose() throws Throwable { + Session s = openSession(); + s.close(); + String str = buildRecursively( CLOB_SIZE, 'x'); + try { + createClobLocator( s, str ); + if ( isUseConnectionForLobCreationEnabled() ) { + fail( "should have failed w/ SessionException" ); + } + } + catch ( SessionException e ) { + if ( ! isUseConnectionForLobCreationEnabled() ) { + fail( "should not have failed w/ SessionException" ); + } + } + } + + protected boolean isUseConnectionForLobCreationEnabled() { + return ( ( SessionFactoryImplementor ) getSessions() ).getSettings().isUseConnectionForLobCreationEnabled(); + } + + protected boolean jvmAndDriverSupportUseConnectionForLobCreation() throws SQLException { + if ( ! Environment.jvmSupportsJDBC4() ) { + return false; + } + Class c = ( ( SessionFactoryImplementor ) getSessions() ).getConnectionProvider().getConnection().getClass(); + try { + return !( Connection.class.equals( c.getMethod( "createBlob", new Class[0] ).getDeclaringClass() ) || + Connection.class.equals( c.getMethod( "createClob", new Class[0] ).getDeclaringClass() ) ); + } + catch ( NoSuchMethodException e ) { + return false; + } + } + +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractClobTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractClobTest.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/AbstractClobTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,410 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import java.sql.SQLException; +import java.sql.Clob; +import java.io.IOException; + +import org.hibernate.LockMode; +import org.hibernate.Session; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.H2Dialect; +import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; + +/** + * Test various access scenarios for eager and lazy materialization + * of CLOB data, as well as bounded and unbounded materialization + * and mutation. + * + * @author Steve Ebersole + */ +public abstract class AbstractClobTest extends DatabaseSpecificFunctionalTestCase { + public static final int CLOB_SIZE = 10000; + + public AbstractClobTest(String name) { + super( name ); + } + + public String[] getMappings() { + return new String[] { "lob/LobMappings.hbm.xml" }; + } + + public boolean appliesTo(Dialect dialect) { + if ( ! dialect.supportsExpectedLobUsagePattern() ) { + reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" ); + return false; + } + return true; + } + + protected abstract Clob createClobLocator(Session s, String str); + + protected abstract Clob createClobLocatorFromStreamUsingLength(Session s, String str ) throws IOException ; + + protected boolean skipLobLocatorTests() throws SQLException { + return false; + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + // set connection pool size to 0 so that tests will always use a clean connection; + // this ensures that the test does not use LOB data left on the connection from + // prior to being returned to the connection pool. + cfg.setProperty( Environment.POOL_SIZE, "0" ); + // ConnectionReleaseMode.AFTER_TRANSACTION is the default for non-JTA connection. + // The Connection used for the unit tests is non-JTA. This setting for + // Environment.RELEASE_CONNECTIONS is just to make it explicit for these tests. + cfg.setProperty( Environment.RELEASE_CONNECTIONS, "after_transaction" ); + } + + public void testBoundedMaterializedClobAccess() { + String original = buildRecursively( CLOB_SIZE, 'x' ); + String changed = buildRecursively( CLOB_SIZE, 'y' ); + + Session s = openSession(); + s.beginTransaction(); + LobHolder entity = new LobHolder(); + entity.setMaterializedClob( original ); + s.save( entity ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( CLOB_SIZE, entity.getMaterializedClob().length() ); + assertEquals( original, entity.getMaterializedClob() ); + entity.setMaterializedClob( changed ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( CLOB_SIZE, entity.getMaterializedClob().length() ); + assertEquals( changed, entity.getMaterializedClob() ); + s.delete( entity ); + s.getTransaction().commit(); + s.close(); + } + + public void testBoundedClobLocatorAccess() throws Throwable { + if ( skipLobLocatorTests() ) { + return; + } + + String original = buildRecursively( CLOB_SIZE, 'x'); + String changed = buildRecursively( CLOB_SIZE, 'y' ); + + Session s = openSession(); + s.beginTransaction(); + LobHolder entity = new LobHolder(); + entity.setClobLocator( createClobLocator( s, original ) ); + s.save( entity ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); + assertEquals( original, extractData( entity.getClobLocator() ) ); + s.getTransaction().commit(); + s.close(); + + // test mutation via setting the new clob data... + if ( supportsLobValueChangePropogation() ) { + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + entity.getClobLocator().truncate( 1 ); + entity.getClobLocator().setString( 1, changed ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + assertNotNull( entity.getClobLocator() ); + assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); + assertEquals( changed, extractData( entity.getClobLocator() ) ); + entity.getClobLocator().truncate( 1 ); + entity.getClobLocator().setString( 1, original ); + s.getTransaction().commit(); + s.close(); + } + + // test mutation via supplying a new clob locator instance... + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + assertNotNull( entity.getClobLocator() ); + assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); + assertEquals( original, extractData( entity.getClobLocator() ) ); + entity.setClobLocator( createClobLocator( s, changed ) ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); + assertEquals( changed, extractData( entity.getClobLocator() ) ); + s.delete( entity ); + s.getTransaction().commit(); + s.close(); + } + + public void testBoundedClobLocatorAccessFromStreamUsingLength() throws Throwable { + if ( skipLobLocatorTests() ) { + return; + } + + String original = buildRecursively( CLOB_SIZE, 'x'); + String changed = buildRecursively( CLOB_SIZE, 'y' ); + + Session s = openSession(); + s.beginTransaction(); + LobHolder entity = new LobHolder(); + entity.setClobLocator( createClobLocatorFromStreamUsingLength( s, original ) ); + s.save( entity ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); + assertEquals( original, extractData( entity.getClobLocator() ) ); + s.getTransaction().commit(); + s.close(); + + // test mutation via setting the new clob data... + if ( supportsLobValueChangePropogation() ) { + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + entity.getClobLocator().truncate( 1 ); + entity.getClobLocator().setString( 1, changed ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + assertNotNull( entity.getClobLocator() ); + assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); + assertEquals( changed, extractData( entity.getClobLocator() ) ); + entity.getClobLocator().truncate( 1 ); + entity.getClobLocator().setString( 1, original ); + s.getTransaction().commit(); + s.close(); + } + + // test mutation via supplying a new clob locator instance... + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); + assertNotNull( entity.getClobLocator() ); + assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); + assertEquals( original, extractData( entity.getClobLocator() ) ); + entity.setClobLocator( createClobLocatorFromStreamUsingLength( s, changed ) ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); + assertEquals( changed, extractData( entity.getClobLocator() ) ); + s.delete( entity ); + s.getTransaction().commit(); + s.close(); + } + + public void testUnboundedClobLocatorAccess() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + + // Note: unbounded mutation of the underlying lob data is completely + // unsupported; most databases would not allow such a construct anyway. + // Thus here we are only testing materialization... + + String original = buildRecursively( CLOB_SIZE, 'x' ); + + Session s = openSession(); + s.beginTransaction(); + LobHolder entity = new LobHolder(); + entity.setClobLocator( createClobLocator( s, original ) ); + s.save( entity ); + s.getTransaction().commit(); + s.close(); + + // load the entity with the clob locator, and close the session/transaction; + // at that point it is unbounded... + s = openSession(); + s.beginTransaction(); + entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); + s.getTransaction().commit(); + s.close(); + + assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); + assertEquals( original, extractData( entity.getClobLocator() ) ); + + s = openSession(); + s.beginTransaction(); + s.delete( entity ); + s.getTransaction().commit(); + s.close(); + } + + public void testCreateAndAccessLobLocatorInSessionNoTransaction() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + String str = buildRecursively( CLOB_SIZE, 'x' ); + Clob clob = createClobLocator( s, str ); + assertEquals( CLOB_SIZE, clob.length() ); + assertEquals( str, extractData( clob ) ); + s.close(); + } + + public void testCreateAndAccessLobLocatorInTransaction() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + String str = buildRecursively( CLOB_SIZE, 'x' ); + Clob clob = createClobLocator( s, str ); + assertEquals( CLOB_SIZE, clob.length() ); + assertEquals( str, extractData( clob ) ); + s.getTransaction().commit(); + s.close(); + } + + public void testCreateLobLocatorInTransactionAccessOutOfTransaction() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + String str = buildRecursively( CLOB_SIZE, 'x' ); + Clob clob = createClobLocator( s, str ); + s.getTransaction().commit(); + assertEquals( CLOB_SIZE, clob.length() ); + assertEquals( str, extractData( clob ) ); + s.close(); + } + + public void testCreateLobLocatorInTransactionAccessInNextTransaction() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + String str = buildRecursively( CLOB_SIZE, 'x' ); + Clob clob = createClobLocator( s, str ); + s.getTransaction().commit(); + s.getTransaction().begin(); + assertEquals( CLOB_SIZE, clob.length() ); + assertEquals( str, extractData( clob ) ); + s.getTransaction().commit(); + s.close(); + } + + public void testCreateLobLocatorInTransactionAccessAfterSessionClose() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + String str = buildRecursively( CLOB_SIZE, 'x' ); + Clob clob = createClobLocator( s, str ); + s.getTransaction().commit(); + s.close(); + assertEquals( CLOB_SIZE, clob.length() ); + assertEquals( str, extractData( clob ) ); + } + + public void testCreateLobLocatorInTransactionAccessInNextSession() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + String str = buildRecursively( CLOB_SIZE, 'x' ); + Clob clob = createClobLocator( s, str ); + s.getTransaction().commit(); + s.close(); + s = openSession(); + assertEquals( CLOB_SIZE, clob.length() ); + assertEquals( str, extractData( clob ) ); + s.close(); + } + + public void testCreateLobLocatorInTransactionAccessInNextSessionTransaction() throws Throwable { + if ( skipLobLocatorTests() || ! supportsUnboundedLobLocatorMaterialization() ) { + return; + } + Session s = openSession(); + s.getTransaction().begin(); + String str = buildRecursively( CLOB_SIZE, 'x' ); + Clob clob = createClobLocator( s, str ); + s.getTransaction().commit(); + s.close(); + s = openSession(); + s.getTransaction().begin(); + assertEquals( CLOB_SIZE, clob.length() ); + assertEquals( str, extractData( clob ) ); + s.getTransaction().commit(); + s.close(); + } + + protected String extractData(Clob clob) throws Throwable { + if ( getDialect() instanceof H2Dialect ) { + return clob.getSubString( 1, ( int ) clob.length() ); + } + else { + char[] data = new char[ (int) clob.length() ]; + clob.getCharacterStream().read( data ); + return new String( data ); + } + } + + protected String buildRecursively(int size, char baseChar) { + StringBuffer buff = new StringBuffer(); + for( int i = 0; i < size; i++ ) { + buff.append( baseChar ); + } + return buff.toString(); + } +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorDefaultTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorDefaultTest.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorDefaultTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,65 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import java.sql.SQLException; + +import junit.framework.Test; + +import org.hibernate.lob.LobCreatorImplJDBC4; +import org.hibernate.lob.LobCreatorImplJDBC3; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; + +/** + * This class extends AbstractBlobFromLobCreatorTest to provide logic to + * determine if the correct LobCreator impl is used when + * Environment.USE_CONNECTION_FOR_LOB_CREATION is not set. The actual impl + * will depend on whether the JVM and driver support creating LOBs using + * the connection. + * + * @author Gail Badner + */ +public class BlobFromLobCreatorDefaultTest extends AbstractBlobFromLobCreatorTest { + + public BlobFromLobCreatorDefaultTest(String name) { + super( name ); + } + + protected Boolean getUseConnectionForLobCreationPropertyValue() { + return null; + } + + protected Class getExpectedLobCreatorClass() throws SQLException { + return ( jvmAndDriverSupportUseConnectionForLobCreation() ? + LobCreatorImplJDBC4.class : + LobCreatorImplJDBC3.class + ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( BlobFromLobCreatorDefaultTest.class ); + } +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC3ConnRelOnCloseTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC3ConnRelOnCloseTest.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC3ConnRelOnCloseTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,54 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import junit.framework.Test; + +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; + +/** + * This class extends BlobFromLobCreatorJDBC3Test to run tests + * using connection release mode "on_close". + * + * @author Gail Badner + */ +public class BlobFromLobCreatorJDBC3ConnRelOnCloseTest extends BlobFromLobCreatorJDBC3Test { + + public BlobFromLobCreatorJDBC3ConnRelOnCloseTest(String name) { + super( name ); + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + cfg.setProperty( Environment.RELEASE_CONNECTIONS, "on_close" ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( BlobFromLobCreatorJDBC3ConnRelOnCloseTest.class ); + } +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC3Test.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC3Test.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC3Test.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,59 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import junit.framework.Test; + +import org.hibernate.lob.LobCreatorImplJDBC3; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; + +/** + * This class extends AbstractBlobFromLobCreatorTest to determine if the + * correct LobCreator impl is used when Environment.USE_CONNECTION_FOR_LOB_CREATION + * is set to false. The actual impl should be the JDBC3 LobCreator, even when + * the JVM and JDBC driver support JDBC4. The JDBC3 LobCreator does not use the + * Connection to create LOBs. + * + * @author Gail Badner + */ +public class BlobFromLobCreatorJDBC3Test extends AbstractBlobFromLobCreatorTest { + + public BlobFromLobCreatorJDBC3Test(String name) { + super( name ); + } + + protected Boolean getUseConnectionForLobCreationPropertyValue() { + return Boolean.FALSE; + } + + protected Class getExpectedLobCreatorClass() { + return LobCreatorImplJDBC3.class; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( BlobFromLobCreatorJDBC3Test.class ); + } +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC4ConnRelOnCloseTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC4ConnRelOnCloseTest.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC4ConnRelOnCloseTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,54 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import junit.framework.Test; + +import org.hibernate.cfg.Environment; +import org.hibernate.cfg.Configuration; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; + +/** + * This class extends BlobFromLobCreatorJDBC4Test to run tests + * using connection release mode "on_close". + * + * @author Gail Badner + */ +public class BlobFromLobCreatorJDBC4ConnRelOnCloseTest extends BlobFromLobCreatorJDBC4Test { + + public BlobFromLobCreatorJDBC4ConnRelOnCloseTest(String name) { + super( name ); + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + cfg.setProperty( Environment.RELEASE_CONNECTIONS, "on_close" ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( BlobFromLobCreatorJDBC4ConnRelOnCloseTest.class ); + } +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC4Test.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC4Test.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobFromLobCreatorJDBC4Test.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,112 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import java.sql.SQLException; +import java.sql.Blob; + +import junit.framework.Test; + +import org.hibernate.lob.LobCreatorImplJDBC4; +import org.hibernate.cfg.Environment; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.Session; +import org.hibernate.HibernateException; + +/** + * This class extends AbstractBlobFromLobCreatorTest to determine if the + * correct LobCreator impl is used when Environment.USE_CONNECTION_FOR_LOB_CREATION + * is set to true. The actual impl should be the JDBC4 LobCreator, even when + * the JVM and/or JDBC driver do not support JDBC4. The JDBC4 LobCreator uses the + * Connection to create LOBs. + * + * @author Gail Badner + */ +public class BlobFromLobCreatorJDBC4Test extends AbstractBlobFromLobCreatorTest { + + public BlobFromLobCreatorJDBC4Test(String name) { + super( name ); + } + + protected Boolean getUseConnectionForLobCreationPropertyValue() { + return Boolean.TRUE; + } + + protected Class getExpectedLobCreatorClass() { + return LobCreatorImplJDBC4.class; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( BlobFromLobCreatorJDBC4Test.class ); + } + + protected boolean skipLobLocatorTests() throws SQLException { + if ( ! Environment.jvmSupportsJDBC4() ) { + reportSkip( "JVM does not support creating LOBs using the connection", "LOB support" ); + return true; + } + if ( ! jvmAndDriverSupportUseConnectionForLobCreation() ) { + reportSkip( "Driver does not support creating LOBs using the connection", "LOB support" ); + return true; + } + return false; + } + + public void testCreateBlobLocatorSupport() throws Throwable { + Session s = openSession(); + s.getTransaction().begin(); + byte[] bytes = buildRecursively( BLOB_SIZE, true ); + try { + Blob blob = createBlobLocator( s, bytes ); + if ( ! Environment.jvmSupportsJDBC4() ) { + fail( "should have thrown NoSuchMethodException" ); + } + else if ( ! jvmAndDriverSupportUseConnectionForLobCreation() ) { + fail( "should have thrown AbstractMethodException" ); + } + assertEquals( bytes, extractData( blob ) ); + s.getTransaction().commit(); + } + catch( HibernateException e ) { + s.getTransaction().rollback(); + if ( e.getCause() instanceof NoSuchMethodException ) { + assertTrue( ! Environment.jvmSupportsJDBC4() && + isUseConnectionForLobCreationEnabled() ); + } + else if ( e.getCause() instanceof AbstractMethodError ) { + assertTrue( Environment.jvmSupportsJDBC4() && + ! jvmAndDriverSupportUseConnectionForLobCreation() && + isUseConnectionForLobCreationEnabled() ); + } + else { + throw e; + } + } + finally { + s.close(); + } + } +} \ No newline at end of file Modified: core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobTest.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/BlobTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,200 +1,67 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; import java.sql.Blob; +import java.io.ByteArrayInputStream; +import java.io.IOException; -import junit.framework.AssertionFailedError; import junit.framework.Test; import org.hibernate.Hibernate; -import org.hibernate.LockMode; import org.hibernate.Session; -import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.util.ArrayHelper; /** - * {@inheritDoc} + * This class extends AbstractBlobTest so that LOBs are created using the + * Hibernate.createBlob() APIs. These APIs do not use the connection to + * create LOBs. * * @author Steve Ebersole */ -public class BlobTest extends DatabaseSpecificFunctionalTestCase { - private static final int BLOB_SIZE = 10000; +public class BlobTest extends AbstractBlobTest { public BlobTest(String name) { super( name ); } - public String[] getMappings() { - return new String[] { "lob/LobMappings.hbm.xml" }; - } - public static Test suite() { return new FunctionalTestClassTestSuite( BlobTest.class ); } - public boolean appliesTo(Dialect dialect) { - if ( ! dialect.supportsExpectedLobUsagePattern() ) { - reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" ); - return false; - } - return true; + protected Blob createBlobLocator(Session s, byte[] bytes) { + return Hibernate.createBlob( bytes ); } - public void testBoundedMaterializedBlobAccess() { - byte[] original = buildRecursively( BLOB_SIZE, true ); - byte[] changed = buildRecursively( BLOB_SIZE, false ); - - Session s = openSession(); - s.beginTransaction(); - LobHolder entity = new LobHolder(); - entity.setMaterializedBlob( original ); - s.save( entity ); - s.getTransaction().commit(); - s.close(); - - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); - assertEquals( BLOB_SIZE, entity.getMaterializedBlob().length ); - assertEquals( original, entity.getMaterializedBlob() ); - entity.setMaterializedBlob( changed ); - s.getTransaction().commit(); - s.close(); - - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); - assertEquals( BLOB_SIZE, entity.getMaterializedBlob().length ); - assertEquals( changed, entity.getMaterializedBlob() ); - s.delete( entity ); - s.getTransaction().commit(); - s.close(); + protected Blob createBlobLocatorFromStream(Session s, byte[] bytes) throws IOException { + return Hibernate.createBlob( new ByteArrayInputStream( bytes ) ); } - public void testBoundedBlobLocatorAccess() throws Throwable { - byte[] original = buildRecursively( BLOB_SIZE, true ); - byte[] changed = buildRecursively( BLOB_SIZE, false ); - - Session s = openSession(); - s.beginTransaction(); - LobHolder entity = new LobHolder(); - entity.setBlobLocator( Hibernate.createBlob( original ) ); - s.save( entity ); - s.getTransaction().commit(); - s.close(); - - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); - assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); - assertEquals( original, extractData( entity.getBlobLocator() ) ); - s.getTransaction().commit(); - s.close(); - - // test mutation via setting the new clob data... - if ( supportsLobValueChangePropogation() ) { - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); - entity.getBlobLocator().truncate( 1 ); - entity.getBlobLocator().setBytes( 1, changed ); - s.getTransaction().commit(); - s.close(); - - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); - assertNotNull( entity.getBlobLocator() ); - assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); - assertEquals( changed, extractData( entity.getBlobLocator() ) ); - entity.getBlobLocator().truncate( 1 ); - entity.getBlobLocator().setBytes( 1, original ); - s.getTransaction().commit(); - s.close(); - } - - // test mutation via supplying a new clob locator instance... - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); - assertNotNull( entity.getBlobLocator() ); - assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); - assertEquals( original, extractData( entity.getBlobLocator() ) ); - entity.setBlobLocator( Hibernate.createBlob( changed ) ); - s.getTransaction().commit(); - s.close(); - - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); - assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); - assertEquals( changed, extractData( entity.getBlobLocator() ) ); - s.delete( entity ); - s.getTransaction().commit(); - s.close(); - + protected Blob createBlobLocatorFromStreamUsingLength(Session s, byte[] bytes) throws IOException { + return Hibernate.createBlob( new ByteArrayInputStream( bytes ), bytes.length ); } - - public void testUnboundedBlobLocatorAccess() throws Throwable { - if ( ! supportsUnboundedLobLocatorMaterialization() ) { - return; - } - - // Note: unbounded mutation of the underlying lob data is completely - // unsupported; most databases would not allow such a construct anyway. - // Thus here we are only testing materialization... - - byte[] original = buildRecursively( BLOB_SIZE, true ); - - Session s = openSession(); - s.beginTransaction(); - LobHolder entity = new LobHolder(); - entity.setBlobLocator( Hibernate.createBlob( original ) ); - s.save( entity ); - s.getTransaction().commit(); - s.close(); - - // load the entity with the clob locator, and close the session/transaction; - // at that point it is unbounded... - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); - s.getTransaction().commit(); - s.close(); - - assertEquals( BLOB_SIZE, entity.getBlobLocator().length() ); - assertEquals( original, extractData( entity.getBlobLocator() ) ); - - s = openSession(); - s.beginTransaction(); - s.delete( entity ); - s.getTransaction().commit(); - s.close(); - } - - private byte[] extractData(Blob blob) throws Throwable { - return blob.getBytes( 1, ( int ) blob.length() ); - } - - - private byte[] buildRecursively(int size, boolean on) { - byte[] data = new byte[size]; - data[0] = mask( on ); - for ( int i = 0; i < size; i++ ) { - data[i] = mask( on ); - on = !on; - } - return data; - } - - private byte mask(boolean on) { - return on ? ( byte ) 1 : ( byte ) 0; - } - - public static void assertEquals(byte[] val1, byte[] val2) { - if ( !ArrayHelper.isEquals( val1, val2 ) ) { - throw new AssertionFailedError( "byte arrays did not match" ); - } - } } + Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorDefaultTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorDefaultTest.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorDefaultTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,65 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import java.sql.SQLException; + +import junit.framework.Test; + +import org.hibernate.lob.LobCreatorImplJDBC4; +import org.hibernate.lob.LobCreatorImplJDBC3; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; + +/** + * This class extends AbstractClobFromLobCreatorTest to provide logic to + * determine if the correct LobCreator impl is used when + * Environment.USE_CONNECTION_FOR_LOB_CREATION is not set. The actual impl + * will depend on whether the JVM and driver support creating LOBs using + * the connection. + * + * @author Gail Badner + */ +public class ClobFromLobCreatorDefaultTest extends AbstractClobFromLobCreatorTest { + + public ClobFromLobCreatorDefaultTest(String name) { + super( name ); + } + + protected Boolean getUseConnectionForLobCreationPropertyValue() { + return null; + } + + protected Class getExpectedLobCreatorClass() throws SQLException { + return ( jvmAndDriverSupportUseConnectionForLobCreation() ? + LobCreatorImplJDBC4.class : + LobCreatorImplJDBC3.class + ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( ClobFromLobCreatorDefaultTest.class ); + } +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC3ConnRelOnCloseTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC3ConnRelOnCloseTest.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC3ConnRelOnCloseTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,54 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import junit.framework.Test; + +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; + +/** + * This class extends ClobFromLobCreatorJDBC3Test to run tests + * using connection release mode "on_close". + * + * @author Gail Badner + */ +public class ClobFromLobCreatorJDBC3ConnRelOnCloseTest extends ClobFromLobCreatorJDBC3Test { + + public ClobFromLobCreatorJDBC3ConnRelOnCloseTest(String name) { + super( name ); + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + cfg.setProperty( Environment.RELEASE_CONNECTIONS, "on_close" ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( ClobFromLobCreatorJDBC3ConnRelOnCloseTest.class ); + } +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC3Test.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC3Test.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC3Test.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,59 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import junit.framework.Test; + +import org.hibernate.lob.LobCreatorImplJDBC3; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; + +/** + * This class extends AbstractClobFromLobCreatorTest to determine if the + * correct LobCreator impl is used when Environment.USE_CONNECTION_FOR_LOB_CREATION + * is set to false. The actual impl should be the JDBC3 LobCreator, even when + * the JVM and JDBC driver support JDBC4. The JDBC3 LobCreator does not use the + * Connection to create LOBs. + * + * @author Gail Badner + */ +public class ClobFromLobCreatorJDBC3Test extends AbstractClobFromLobCreatorTest { + + public ClobFromLobCreatorJDBC3Test(String name) { + super( name ); + } + + protected Boolean getUseConnectionForLobCreationPropertyValue() { + return Boolean.FALSE; + } + + protected Class getExpectedLobCreatorClass() { + return LobCreatorImplJDBC3.class; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( ClobFromLobCreatorJDBC3Test.class ); + } +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC4ConnRelOnCloseTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC4ConnRelOnCloseTest.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC4ConnRelOnCloseTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,54 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import junit.framework.Test; + +import org.hibernate.cfg.Environment; +import org.hibernate.cfg.Configuration; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; + +/** + * This class extends ClobFromLobCreatorJDBC4Test to run tests + * using connection release mode "on_close". + * + * @author Gail Badner + */ +public class ClobFromLobCreatorJDBC4ConnRelOnCloseTest extends ClobFromLobCreatorJDBC4Test { + + public ClobFromLobCreatorJDBC4ConnRelOnCloseTest(String name) { + super( name ); + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + cfg.setProperty( Environment.RELEASE_CONNECTIONS, "on_close" ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( ClobFromLobCreatorJDBC4ConnRelOnCloseTest.class ); + } +} \ No newline at end of file Added: core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC4Test.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC4Test.java (rev 0) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobFromLobCreatorJDBC4Test.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -0,0 +1,112 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; + +import java.sql.SQLException; +import java.sql.Clob; + +import junit.framework.Test; + +import org.hibernate.lob.LobCreatorImplJDBC4; +import org.hibernate.cfg.Environment; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.Session; +import org.hibernate.HibernateException; + +/** + * This class extends AbstractClobFromLobCreatorTest to determine if the + * correct LobCreator impl is used when Environment.USE_CONNECTION_FOR_LOB_CREATION + * is set to true. The actual impl should be the JDBC4 LobCreator, even when + * the JVM and/or JDBC driver do not support JDBC4. The JDBC4 LobCreator uses the + * Connection to create LOBs. + * + * @author Gail Badner + */ +public class ClobFromLobCreatorJDBC4Test extends AbstractClobFromLobCreatorTest { + + public ClobFromLobCreatorJDBC4Test(String name) { + super( name ); + } + + protected Boolean getUseConnectionForLobCreationPropertyValue() { + return Boolean.TRUE; + } + + protected Class getExpectedLobCreatorClass() { + return LobCreatorImplJDBC4.class; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( ClobFromLobCreatorJDBC4Test.class ); + } + + protected boolean skipLobLocatorTests() throws SQLException { + if ( ! Environment.jvmSupportsJDBC4() ) { + reportSkip( "JVM does not support creating LOBs using the connection", "LOB support" ); + return true; + } + if ( ! jvmAndDriverSupportUseConnectionForLobCreation() ) { + reportSkip( "Driver does not support creating LOBs using the connection", "LOB support" ); + return true; + } + return false; + } + + public void testCreateClobLocatorSupport() throws Throwable { + Session s = openSession(); + s.getTransaction().begin(); + String str = buildRecursively( CLOB_SIZE, 'x' ); + try { + Clob clob = createClobLocator( s, str ); + if ( ! Environment.jvmSupportsJDBC4() ) { + fail( "should have thrown NoSuchMethodException" ); + } + else if ( ! jvmAndDriverSupportUseConnectionForLobCreation() ) { + fail( "should have thrown AbstractMethodException" ); + } + assertEquals( str, extractData( clob ) ); + s.getTransaction().commit(); + } + catch( HibernateException e ) { + s.getTransaction().rollback(); + if ( e.getCause() instanceof NoSuchMethodException ) { + assertTrue( ! Environment.jvmSupportsJDBC4() && + isUseConnectionForLobCreationEnabled() ); + } + else if ( e.getCause() instanceof AbstractMethodError ) { + assertTrue( Environment.jvmSupportsJDBC4() && + ! jvmAndDriverSupportUseConnectionForLobCreation() && + isUseConnectionForLobCreationEnabled() ); + } + else { + throw e; + } + } + finally { + s.close(); + } + } +} \ No newline at end of file Modified: core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobTest.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/ClobTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,196 +1,62 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; import java.sql.Clob; +import java.io.IOException; +import java.io.StringReader; import junit.framework.Test; import org.hibernate.Hibernate; -import org.hibernate.LockMode; import org.hibernate.Session; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.H2Dialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; import org.hibernate.junit.functional.FunctionalTestClassTestSuite; /** - * Test various access scenarios for eager and lazy materialization - * of CLOB data, as well as bounded and unbounded materialization - * and mutation. + * This class extends AbstractClobTest so that LOBs are created using the + * Hibernate.createClob() APIs. These APIs do not use the connection to + * create LOBs. * * @author Steve Ebersole */ -public class ClobTest extends DatabaseSpecificFunctionalTestCase { - private static final int CLOB_SIZE = 10000; +public class ClobTest extends AbstractClobTest { public ClobTest(String name) { super( name ); } - public String[] getMappings() { - return new String[] { "lob/LobMappings.hbm.xml" }; - } - public static Test suite() { return new FunctionalTestClassTestSuite( ClobTest.class ); } - public boolean appliesTo(Dialect dialect) { - if ( ! dialect.supportsExpectedLobUsagePattern() ) { - reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" ); - return false; - } - return true; + protected Clob createClobLocator(Session s, String str) { + return Hibernate.createClob( str ); } - public void testBoundedMaterializedClobAccess() { - String original = buildRecursively( CLOB_SIZE, 'x' ); - String changed = buildRecursively( CLOB_SIZE, 'y' ); - - Session s = openSession(); - s.beginTransaction(); - LobHolder entity = new LobHolder(); - entity.setMaterializedClob( original ); - s.save( entity ); - s.getTransaction().commit(); - s.close(); - - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); - assertEquals( CLOB_SIZE, entity.getMaterializedClob().length() ); - assertEquals( original, entity.getMaterializedClob() ); - entity.setMaterializedClob( changed ); - s.getTransaction().commit(); - s.close(); - - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); - assertEquals( CLOB_SIZE, entity.getMaterializedClob().length() ); - assertEquals( changed, entity.getMaterializedClob() ); - s.delete( entity ); - s.getTransaction().commit(); - s.close(); + protected Clob createClobLocatorFromStreamUsingLength(Session s, String str) throws IOException { + return Hibernate.createClob( new StringReader( str ), str.length() ); } - - public void testBoundedClobLocatorAccess() throws Throwable { - String original = buildRecursively( CLOB_SIZE, 'x' ); - String changed = buildRecursively( CLOB_SIZE, 'y' ); - - Session s = openSession(); - s.beginTransaction(); - LobHolder entity = new LobHolder(); - entity.setClobLocator( Hibernate.createClob( original ) ); - s.save( entity ); - s.getTransaction().commit(); - s.close(); - - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); - assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); - assertEquals( original, extractData( entity.getClobLocator() ) ); - s.getTransaction().commit(); - s.close(); - - // test mutation via setting the new clob data... - if ( supportsLobValueChangePropogation() ) { - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); - entity.getClobLocator().truncate( 1 ); - entity.getClobLocator().setString( 1, changed ); - s.getTransaction().commit(); - s.close(); - - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); - assertNotNull( entity.getClobLocator() ); - assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); - assertEquals( changed, extractData( entity.getClobLocator() ) ); - entity.getClobLocator().truncate( 1 ); - entity.getClobLocator().setString( 1, original ); - s.getTransaction().commit(); - s.close(); - } - - // test mutation via supplying a new clob locator instance... - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId(), LockMode.UPGRADE ); - assertNotNull( entity.getClobLocator() ); - assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); - assertEquals( original, extractData( entity.getClobLocator() ) ); - entity.setClobLocator( Hibernate.createClob( changed ) ); - s.getTransaction().commit(); - s.close(); - - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); - assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); - assertEquals( changed, extractData( entity.getClobLocator() ) ); - s.delete( entity ); - s.getTransaction().commit(); - s.close(); - - } - - public void testUnboundedClobLocatorAccess() throws Throwable { - if ( ! supportsUnboundedLobLocatorMaterialization() ) { - return; - } - - // Note: unbounded mutation of the underlying lob data is completely - // unsupported; most databases would not allow such a construct anyway. - // Thus here we are only testing materialization... - - String original = buildRecursively( CLOB_SIZE, 'x' ); - - Session s = openSession(); - s.beginTransaction(); - LobHolder entity = new LobHolder(); - entity.setClobLocator( Hibernate.createClob( original ) ); - s.save( entity ); - s.getTransaction().commit(); - s.close(); - - // load the entity with the clob locator, and close the session/transaction; - // at that point it is unbounded... - s = openSession(); - s.beginTransaction(); - entity = ( LobHolder ) s.get( LobHolder.class, entity.getId() ); - s.getTransaction().commit(); - s.close(); - - assertEquals( CLOB_SIZE, entity.getClobLocator().length() ); - assertEquals( original, extractData( entity.getClobLocator() ) ); - - s = openSession(); - s.beginTransaction(); - s.delete( entity ); - s.getTransaction().commit(); - s.close(); - } - - private String extractData(Clob clob) throws Throwable { - if ( getDialect() instanceof H2Dialect ) { - return clob.getSubString( 1, ( int ) clob.length() ); - } - else { - char[] data = new char[ (int) clob.length() ]; - clob.getCharacterStream().read( data ); - return new String( data ); - } - } - - - private String buildRecursively(int size, char baseChar) { - StringBuffer buff = new StringBuffer(); - for( int i = 0; i < size; i++ ) { - buff.append( baseChar ); - } - return buff.toString(); - } -} +} \ No newline at end of file Modified: core/branches/Branch_3_2/test/org/hibernate/test/lob/LobHolder.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/LobHolder.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/LobHolder.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,3 +1,28 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; import java.io.Serializable; Modified: core/branches/Branch_3_2/test/org/hibernate/test/lob/MaterializedBlobType.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/MaterializedBlobType.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/MaterializedBlobType.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,3 +1,28 @@ +//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; import java.sql.Types; Modified: core/branches/Branch_3_2/test/org/hibernate/test/lob/SerializableData.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/SerializableData.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/SerializableData.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,4 +1,28 @@ -// $Id$ +//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; import java.io.Serializable; Modified: core/branches/Branch_3_2/test/org/hibernate/test/lob/SerializableTypeTest.java =================================================================== --- core/branches/Branch_3_2/test/org/hibernate/test/lob/SerializableTypeTest.java 2008-10-28 21:47:32 UTC (rev 15429) +++ core/branches/Branch_3_2/test/org/hibernate/test/lob/SerializableTypeTest.java 2008-10-29 05:38:54 UTC (rev 15430) @@ -1,4 +1,28 @@ -// $Id$ +//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.test.lob; import junit.framework.Test;

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15429 - in core/trunk/annotations: src/main/javadoc and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-28 17:47:32 -0400 (Tue, 28 Oct 2008) New Revision: 15429 Added: core/trunk/annotations/src/main/javadoc/jdstyle.css core/trunk/annotations/src/main/javadoc/package.html Removed: core/trunk/annotations/ivy/ core/trunk/annotations/jdbc/ core/trunk/annotations/lib/ Log: HHH-3550 : import annotations into core Copied: core/trunk/annotations/src/main/javadoc/jdstyle.css (from rev 15426, core/trunk/annotations/doc/api/jdstyle.css) =================================================================== --- core/trunk/annotations/src/main/javadoc/jdstyle.css (rev 0) +++ core/trunk/annotations/src/main/javadoc/jdstyle.css 2008-10-28 21:47:32 UTC (rev 15429) @@ -0,0 +1,117 @@ +/* Javadoc style sheet */ + +/* Define colors, fonts and other style attributes here to override the defaults */ + +/* Page background color */ +body { font-family: Arial; + background-color: white; + font-size: 10pt; + } +td { font-family: Arial; + font-size: 10pt; + } +/* Table colors */ +.TableHeadingColor { background: #F4F4F4 } +.TableSubHeadingColor { background: #F4F4F4 } +.TableRowColor { background: #FFFFFF } + +/* Font used in left-hand frame lists */ +.FrameTitleFont { font-size: normal; font-family: Arial } +.FrameHeadingFont { font-size: normal; font-family: Arial } +.FrameItemFont { font-size: normal; font-family: Arial } + +/* Example of smaller, sans-serif font in frames */ +/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ + +/* Navigation bar fonts and colors */ +.NavBarCell1 { background-color:#F4F4F4;} +.NavBarCell1Rev { background-color:silver;} + +.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} +.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} + +.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} +.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} + +A { + color: #003399; +} + +A:active { + color: #003399; +} + +A:visited { + color: #888888; +} + +P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE { + color: #000000; +} + +TD, TH, SPAN { + color: #000000; +} + +BLOCKQUOTE { + margin-right: 0px; +} + + +/*H1, H2, H3, H4, H5, H6 { + color: #000000; + font-weight:500; + margin-top:10px; + padding-top:15px; +} + +H1 { font-size: 150%; } +H2 { font-size: 140%; } +H3 { font-size: 110%; font-weight: bold; } +H4 { font-size: 110%; font-weight: bold;} +H5 { font-size: 100%; font-style: italic; } +H6 { font-size: 100%; font-style: italic; }*/ + +TT { +font-size: 90%; + font-family: "Courier New", Courier, monospace; + color: #000000; +} + +PRE { +font-size: 90%; + padding: 5px; + border-style: solid; + border-width: 1px; + border-color: #CCCCCC; + background-color: #F4F4F4; +} + +UL, OL, LI { + list-style: disc; +} + +HR { + width: 100%; + height: 1px; + background-color: #CCCCCC; + border-width: 0px; + padding: 0px; + color: #CCCCCC; +} + +.variablelist { + padding-top: 10; + padding-bottom:10; + margin:0; +} + +.itemizedlist, UL { + padding-top: 0; + padding-bottom:0; + margin:0; +} + +.term { + font-weight:bold; +} Copied: core/trunk/annotations/src/main/javadoc/package.html (from rev 15426, core/trunk/annotations/doc/api/package.html) =================================================================== --- core/trunk/annotations/src/main/javadoc/package.html (rev 0) +++ core/trunk/annotations/src/main/javadoc/package.html 2008-10-28 21:47:32 UTC (rev 15429) @@ -0,0 +1 @@ +<body></body>

16 years, 2 months

1
0
0 / 0

Hibernate SVN: r15428 - in core/trunk: annotations and 15 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-10-28 17:41:58 -0400 (Tue, 28 Oct 2008) New Revision: 15428 Added: core/trunk/annotations/src/main/javadoc/ Removed: core/trunk/annotations/.cvsignore core/trunk/annotations/build.properties.dist core/trunk/annotations/build.xml core/trunk/annotations/common-build.xml core/trunk/annotations/doc/api/ core/trunk/annotations/ivy.xml core/trunk/annotations/lgpl.txt core/trunk/annotations/src/filters/ Modified: core/trunk/annotations/ core/trunk/annotations/pom.xml core/trunk/annotations/src/main/java/org/hibernate/AnnotationException.java core/trunk/annotations/src/main/java/org/hibernate/annotations/AccessType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Any.java core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDef.java core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDefs.java core/trunk/annotations/src/main/java/org/hibernate/annotations/BatchSize.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Cache.java core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheModeType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Cascade.java core/trunk/annotations/src/main/java/org/hibernate/annotations/CascadeType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Check.java core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionId.java core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Columns.java core/trunk/annotations/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Entity.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Fetch.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchMode.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Filter.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDef.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDefs.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTable.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTables.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Filters.java core/trunk/annotations/src/main/java/org/hibernate/annotations/FlushModeType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/ForceDiscriminator.java core/trunk/annotations/src/main/java/org/hibernate/annotations/ForeignKey.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Formula.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Generated.java core/trunk/annotations/src/main/java/org/hibernate/annotations/GenerationTime.java core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerator.java core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerators.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Immutable.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Index.java core/trunk/annotations/src/main/java/org/hibernate/annotations/IndexColumn.java core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollection.java core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollectionOption.java core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOne.java core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOneOption.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Loader.java core/trunk/annotations/src/main/java/org/hibernate/annotations/ManyToAny.java core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKey.java core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java core/trunk/annotations/src/main/java/org/hibernate/annotations/MetaValue.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQueries.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQuery.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQueries.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQuery.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NaturalId.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFound.java core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFoundAction.java core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDelete.java core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDeleteAction.java core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLock.java core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLockType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/OrderBy.java core/trunk/annotations/src/main/java/org/hibernate/annotations/ParamDef.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Parameter.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Parent.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Persister.java core/trunk/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Proxy.java core/trunk/annotations/src/main/java/org/hibernate/annotations/ResultCheckStyle.java core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDelete.java core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDeleteAll.java core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLInsert.java core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLUpdate.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Sort.java core/trunk/annotations/src/main/java/org/hibernate/annotations/SortType.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Table.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Tables.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Target.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizer.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizers.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Type.java core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDef.java core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDefs.java core/trunk/annotations/src/main/java/org/hibernate/annotations/Where.java core/trunk/annotations/src/main/java/org/hibernate/annotations/WhereJoinTable.java core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotatedClassType.java core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java core/trunk/annotations/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java core/trunk/annotations/src/main/java/org/hibernate/cfg/FkSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexColumn.java core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/InheritanceState.java core/trunk/annotations/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/NotYetImplementedException.java core/trunk/annotations/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyData.java core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyInferredData.java core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java core/trunk/annotations/src/main/java/org/hibernate/cfg/RecoverableException.java core/trunk/annotations/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/WrappedInferredData.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/BagBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ListBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/MapBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Nullability.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SetBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/TableBinder.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Version.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java core/trunk/annotations/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java core/trunk/annotations/src/main/java/org/hibernate/ejb/orm_1_0.xsd core/trunk/annotations/src/main/java/org/hibernate/mapping/IdGenerator.java core/trunk/annotations/src/main/java/org/hibernate/type/AbstractLobType.java core/trunk/annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java core/trunk/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java core/trunk/annotations/src/main/java/org/hibernate/type/EnumType.java core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java core/trunk/annotations/src/main/java/org/hibernate/type/SerializableToBlobType.java core/trunk/annotations/src/main/java/org/hibernate/type/StringClobType.java core/trunk/annotations/src/test/resources/hibernate.properties core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java core/trunk/envers/pom.xml core/trunk/pom.xml Log: HHH-3550 : import annotations into core Property changes on: core/trunk/annotations ___________________________________________________________________ Name: svn:ignore - target build .* + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover .* Deleted: core/trunk/annotations/.cvsignore =================================================================== --- core/trunk/annotations/.cvsignore 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/.cvsignore 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,9 +0,0 @@ -target -build -build.properties -test_output -testout -common-build.xml -javadoc.bat -build.properties -instrumenttestout Deleted: core/trunk/annotations/build.properties.dist =================================================================== --- core/trunk/annotations/build.properties.dist 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/build.properties.dist 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +0,0 @@ -common.dir=. -src.dir=src -test.dir=test Deleted: core/trunk/annotations/build.xml =================================================================== --- core/trunk/annotations/build.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/build.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,232 +0,0 @@ - - -<project name="Hibernate Annotations" default="dist" basedir="." - xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> - -  - <property file="build.properties"/> - <property file="${user.home}/.ant.properties"/> - -  - <property name="Name" value="Hibernate Annotations"/> - <property name="name" value="hibernate-annotations"/> - <property name="version" value="3.4.0.GA"/> - <property name="javadoc.packagenames" value="org.hibernate.*"/> - <property name="jdbc.dir" value="jdbc"/> - <property name="copy.test" value="true"/> - <property name="javac.source" value="1.5"/> - <property name="javac.target" value="1.5"/> - <property name="common.dir" value="${basedir}"/> - <property name="ivy.dep.dir" value="${basedir}/build/lib"/> - - <available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/> - <property name="jpa-javadoc.dir" value="${dist.doc.dir}/jpa-api"/> - - <import file="${common.dir}/common-build.xml"/> - - <path id="lib.moduleclass.path"> - <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - </fileset> - <fileset dir="${common-build.basedir}/lib/build"> -  - <include name="junitext-*.jar"/> - </fileset> - </path> - - <path id="junit.moduleclasspath"> - <pathelement location="${src.dir}"/> - <pathelement location="${test.dir}"/> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - </fileset> - </path> - - <target name="init"> - <antcall target="common-build.init"/> - <tstamp> - <format property="now" pattern="yyyyMMddhhmmss"/> - </tstamp> - <mkdir dir="${ivy.dep.dir}/core"/> - <mkdir dir="${ivy.dep.dir}/test"/> - <ivy:configure file="${ivy.jar.dir}/ivyconf.xml"/> - </target> - - <target name="compile" depends="init,get.deps.core" - description="Compile the Java source code"> - - <available classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> - <javac srcdir="${src.dir}" destdir="${classes.dir}" - classpathref="lib.class.path" debug="${javac.debug}" - optimize="${javac.optimize}" nowarn="on" source="${javac.source}" - target="${javac.target}"> - <src path="${src.dir}"/> - </javac> - <copy todir="${classes.dir}"> - <fileset dir="${src.dir}"> - <include name="**/resources/*.properties"/> - <include name="**/*.xsd"/> - </fileset> - </copy> - </target> - - <target name="compiletest" depends="compile,get.deps.test" - description="Compile the tests"> - <available classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> - <javac destdir="${testclasses.dir}" classpathref="junit.classpath" - debug="${javac.debug}" optimize="${javac.optimize}" nowarn="on" - source="${javac.source}" target="${javac.target}"> - <src refid="testsrc.path"/> - </javac> - </target> - - <target name="jar" depends="compile" - description="Build the distribution .jar file"> - <mkdir dir="${classes.dir}/META-INF"/> - <manifest file="${classes.dir}/META-INF/MANIFEST.MF"> - <attribute name="Implementation-Title" value="${Name}"/> - <attribute name="Implementation-Version" value="${version}"/> - <attribute name="Implementation-Vendor" value="hibernate.org"/> - <attribute name="Implementation-Vendor-Id" value="hibernate.org"/> - <attribute name="Implementation-URL" - value="http://annotations.hibernate.org"/> - <attribute name="Specification-Title" value="Java Persistence"/> - <attribute name="Specification-Version" value="1.0"/> - <attribute name="Specification-Vendor" value="jcp.org"/> - </manifest> - <antcall target="common-build.jar"/> - <delete file="${dist.dir}/ivy.xml"/> -  - <ivy:resolve conf="default"/> - <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]" - resolver="local" pubrevision="latest" pubdate="${now}" - status="integration"/> - </target> - - <target name="junit" depends="compiletest"> - <for list="${targetdb}" param="db"> - <sequential> - <antcall target="test-resources"> - <param name="db" value="@{db}"/> - </antcall> - <mkdir dir="${testreports.dir}/@{db}"/> - <echo>Running against db: @{db}</echo> - <junit printsummary="yes" haltonfailure="yes" forkmode="once"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest fork="yes" todir="${testreports.dir}/@{db}" - haltonfailure="no"> - <fileset refid="junit.batchtestset"/> - </batchtest> - </junit> - </sequential> - </for> - </target> - -  - <target name="junitsingle" depends="compiletest" - description="Run a single test suite (requires testname and jdbc.driver properties)"> - <for list="${targetdb}" param="db"> - <sequential> - <antcall target="test-resources"> - <param name="db" value="@{db}"/> - </antcall> - <mkdir dir="${testreports.dir}/@{db}"/> - <echo>Running against db: @{db}</echo> - <junit printsummary="yes" fork="yes" haltonfailure="yes"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <test fork="yes" todir="${testreports.dir}/@{db}" - haltonfailure="no" name="${testname}"/> - </junit> - </sequential> - </for> - </target> - - <target name="jpa-javadoc" if="jpa-present"> - <mkdir dir="${jpa-javadoc.dir}"/> - <ant dir="../jpa-api" target="javadoc" inheritAll="false"/> - <copy todir="${jpa-javadoc.dir}"> - <fileset dir="${basedir}/../jpa-api/build/api"> - <include name="**/*.*"/> - </fileset> - </copy> - </target> - -  - <target name="dist" - depends="get.deps.core,get.deps.test,jar,javadoc,jpa-javadoc,copysource,copytest,copylib,extras" - description="Build everything"> - - <ant inheritall="false" dir="${basedir}/doc/reference"/> - <copy todir="${dist.dir}/doc/reference" failonerror="false"> - <fileset dir="${basedir}/doc/reference/build"> - <include name="**/*.*"/> - </fileset> - </copy> - - <copy todir="${dist.dir}" failonerror="false"> - <fileset dir="${common.dir}"> - <include name="common-build.xml"/> - </fileset> - </copy> - <copy todir="${dist.dir}/ivy" failonerror="false"> - <fileset dir="${ivy.jar.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - -  - <copy todir="${dist.lib.dir}" failonerror="false"> - <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - </fileset> - </copy> - <mkdir dir="${dist.lib.dir}/test"/> - <copy todir="${dist.lib.dir}/test" failonerror="false"> - <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - </fileset> - </copy> - - -  - <move file="${dist.lib.dir}/commons-annotations.jar" - tofile="${dist.lib.dir}/hibernate-commons-annotations.jar" - failonerror="false"/> - - <copy file="${basedir}/build.properties.dist" - tofile="${dist.dir}/build.properties" failonerror="false"> - </copy> - <antcall target="common-build.dist"/> - </target> - - <target name="zip-dist" description="zip the dist"> - <zip zipfile="${dist.dir}-${version}.zip"> - <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </zip> - <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> - <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </tar> - </target> - -</project> Deleted: core/trunk/annotations/common-build.xml =================================================================== --- core/trunk/annotations/common-build.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/common-build.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,455 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="common-build" default="dist" - xmlns:artifact="urn:maven-artifact-ant" xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> - <description>Common properties and targets for the HibernateExt - project</description> - - -  - <dirname property="common-build.basedir" file="${ant.file.common-build}"/> - -  - <property file="${common-build.basedir}/build.properties"/> - <property file="${user.home}/.ant.properties"/> - - <property name="src.dir" location="src/java"/> - <property name="test.dir" location="src/test"/> - <property name="test.resources.dir" location="src/test-resources"/> - <property name="filter.dir" location="src/filters"/> - <property name="lib.dir" location="lib"/> - <property name="build.dir" location="build"/> - <property name="classes.dir" location="${build.dir}/classes"/> - <property name="testclasses.dir" location="${build.dir}/testclasses"/> - <property name="testreports.dir" location="${build.dir}/test-reports"/> - <property name="dist.target.dir" location="target"/> - <property name="dist.dir" location="${dist.target.dir}/${name}"/> - <property name="instrumenttest.out.dir" value="${build.dir}/test-reports/instrument"/> - <property name="doc.dir" location="doc"/> - <property name="doc.api.dir" location="${doc.dir}/api"/> - <property name="doc.reference.dir" location="${doc.dir}/reference"/> - - <property name="dist.doc.dir" location="${dist.dir}/doc"/> - <property name="dist.api.dir" location="${dist.dir}/doc/api"/> - - <property name="dist.src.dir" location="${dist.dir}/src"/> - <property name="dist.test.dir" location="${dist.dir}/test"/> - <property name="dist.lib.dir" location="${dist.dir}/lib"/> - <property name="jar.name" value="${name}"/> - <property name="jar.file.name" value="${dist.dir}/${jar.name}.jar"/> - <property name="jartest.file.name" value="${dist.dir}/${jar.name}-tests.jar"/> - - <property name="javadoc" value="http://java.sun.com/j2se/1.4/docs/api"/> - <property name="javac.debug" value="on"/> - <property name="javac.optimize" value="off"/> - <property name="javac.source" value="1.4"/> - <property name="javac.target" value="1.4"/> - - <property name="pom.file" value="${build.dir}/pom.xml"/> - <property name="src.jar" value="${build.dir}/src.jar"/> - - <taskdef name="junit" - classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> -  - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <taskdef name="junitreport" - classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> -  - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> -  - <include name="ant-contrib-*.jar"/> - </fileset> - </classpath> - </taskdef> - -  - <property name="ivy.jar.dir" value="${common-build.basedir}/ivy"/> - <property name="ivy.conf.dir" value="${common-build.basedir}"/> - <path id="ivy.lib.path"> - <fileset dir="${ivy.jar.dir}" includes="*.jar"/> - </path> - <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" - uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> - -  - <path id="maven-ant-tasks.path" path="${ivy.jar.dir}/maven-ant-tasks.jar"/> - <typedef resource="org/apache/maven/artifact/ant/antlib.xml" - uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.path"/> - - <artifact:remoteRepository id="offline.repository.jboss.org" - url="file://${offline.repository.jboss.org}"/> - - <path id="lib.class.path"> - <path refid="lib.moduleclass.path"/> - <pathelement path="${clover.jar}"/> - </path> - -  - <path id="lib.moduleclass.path"/> - - <patternset id="support.files"> - <include name="**/*.jpg"/> - <include name="**/*.gif"/> - <include name="**/*.dtd"/> - <include name="**/*.xsd"/> - <include name="**/*.xml"/> - <include name="**/*.xslt"/> - -  - <exclude name="${build.dir}/**/*"/> - <exclude name="${doc.dir}/**/*"/> - <exclude name="classes/**/*"/> - <exclude name="build.xml"/> - <exclude name="**/*.properties"/> - <exclude name="**/*.ccf"/> - <exclude name="**/*.cfg.xml"/> - <exclude name="**/ehcache.xml"/> - </patternset> - - <patternset id="source.files"> - <include name="**/*.java"/> - <include name="**/*.properties"/> - </patternset> - -  - <fileset dir="${testclasses.dir}" id="junit.batchtestset"> - <include name="**/*Test.class"/> - </fileset> - - <path id="testsrc.path"> - <pathelement location="${test.dir}"/> - </path> - - <path id="junit.classpath"> - <pathelement path="${classes.dir}"/> - <pathelement path="${testclasses.dir}"/> - <path refid="lib.class.path"/> - <path refid="junit.moduleclasspath"/> - <path location="${clover.jar}"/> - </path> - -  - <if> - <equals arg1="${targetdb}" arg2="$${targetdb}"/> - <then> - <echo message="No target database specified using default HSQLDB"/> - <property name="targetdb" value="hsqldb"/> - </then> - </if> - -  - <target name="with.clover"> - <clover-setup initString="clover_coverage.db"/> - </target> - - <target name="cloverreport.html" depends="with.clover" - description="Generate a clover report from the current clover database."> - <clover-report> - <current outfile="${clover.out.dir}"> - <format type="html"/> - </current> - </clover-report> - </target> - - <target name="cloverreport" - depends="with.clover,junitreport,cloverreport.html" - description="Run the tests and generate a clover report"> - </target> - -  - <target name="clean" description="Cleans up build and dist directories"> - <delete dir="${build.dir}"/> - <delete dir="${dist.target.dir}"/> - <delete dir="${clover.out.dir}"/> - </target> - - <target name="init" description="Initialize the build"> - <tstamp> - <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/> - </tstamp> - <tstamp> - <format property="releasedate" pattern="dd-MM-yyyy"/> - </tstamp> - <echo message="Build ${Name}-${version} (${subversion})"/> - <mkdir dir="${classes.dir}"/> - <mkdir dir="${testclasses.dir}"/> - <copy todir="${classes.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - <filter token="version" value="${version}"/> - <filter token="releasedate" value="${releasedate}"/> - <copy todir="${build.dir}" filtering="true"> - <fileset dir="."> - <include name="readme.txt"/> - <include name="lgpl.txt"/> - <include name="pom.xml"/> - </fileset> - </copy> - </target> - - <target name="get.deps.core" depends="init" - description="retrieve the core dependencies"> - <ivy:resolve conf="default"/> - <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" - conf="default"/> - </target> - - <target name="get.deps.test" depends="init" - description="retrieve the test dependencies"> - <ivy:resolve conf="test"/> - <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test"/> - </target> - - <target name="copytest" description="Copy tests to dist dir" if="copy.test"> - <mkdir dir="${dist.test.dir}"/> - <copy todir="${dist.test.dir}"> - <fileset dir="${test.dir}"/> - </copy> - </target> - - <target name="copysource" depends="copytest" - description="Copy sources to dist dir"> - <mkdir dir="${dist.src.dir}"/> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="source.files"/> - </fileset> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - <mkdir dir="${dist.src.dir}"/> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="source.files"/> - </fileset> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - </target> - - <target name="copylib" description="Copy jars to lib dir"> - <mkdir dir="${dist.lib.dir}"/> - <copy todir="${dist.lib.dir}" verbose="true"> - <fileset dir="${lib.dir}"> - <include name="**/*.jar"/> - <exclude name="log4j.jar"/> - <exclude name="checkstyle*.jar"/> - <include name="*.txt"/> - </fileset> - </copy> - </target> - - <target name="copydoc" description="Copy doc to dist dir" if="copy.doc"> - <mkdir dir="${dist.doc.dir}"/> - <copy todir="${dist.doc.dir}"> - <fileset dir="${doc.dir}"> - <include name="**/*.html"/> - </fileset> - </copy> - </target> - - <target name="jar" depends="compile" - description="Build the distribution .jar file"> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jar.file.name}" - basedir="${classes.dir}"/> - </target> - - <target name="jartest" depends="compiletest" - description="Build the distribution .jar file"> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jartest.file.name}" - basedir="${testclasses.dir}"/> - </target> - -  - - <target name="javadoc" - description="Compile the Javadoc API documentation to dist dir"> - <mkdir dir="${dist.api.dir}"/> - <javadoc packagenames="${javadoc.packagenames}" - classpathref="lib.class.path" destdir="${dist.api.dir}" use="true" - protected="true" version="true" - windowtitle="${Name} API Documentation" - Overview="${doc.api.dir}/package.html" - doctitle="${Name} API Documentation" - stylesheetfile="${doc.api.dir}/jdstyle.css" link="${javadoc}"> - <packageset dir="${src.dir}" defaultexcludes="yes"> - <include name="**/*"/> - </packageset> - </javadoc> - </target> - - <target name="extras" description="Copies miscellaneous files to root dir"> - <copy todir="${dist.dir}/bin" failonerror="false"> - <fileset dir="bin"> - <include name="*.bat"/> - </fileset> - </copy> - <copy file="${build.dir}/readme.txt" todir="${dist.dir}"/> - <copy file="lgpl.txt" todir="${dist.dir}"/> - <copy file="changelog.txt" todir="${dist.dir}"/> - <copy file="build.xml" todir="${dist.dir}"/> - <replace file="${dist.dir}/build.xml"> - <replacetoken><![CDATA[../${name}-${version}]]> - </replacetoken> - <replacevalue><![CDATA[../${name}]]> - </replacevalue> - </replace> - </target> - - <target name="dist" depends="jar,javadoc,copysource,copydoc,extras" - description="Build everything"> - <zip zipfile="${dist.dir}-${version}.zip"> - <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </zip> - <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> - <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </tar> - </target> - - <target name="info" description="Echoes useful system properties"> - <echo message="java.vm.info=${java.vm.info}"/> - <echo message="java.vm.name=${java.vm.name}"/> - <echo message="java.vm.vendor=${java.vm.vendor}"/> - <echo message="java.vm.version=${java.vm.version}"/> - <echo message="os.arch=${os.arch}"/> - <echo message="os.name=${os.name}"/> - <echo message="os.version=${os.version}"/> - <echo message="java.home = ${java.home}"/> - <echo message="java.class.path = ${java.class.path}"/> - <echo message="build.compiler = ${build.compiler}"/> - <echo message="file.encoding=${file.encoding}"/> - <echo message="user.home = ${user.home}"/> - <echo message="user.language=${user.language}"/> - </target> - - <target name="test-resources" description="Copies and filters test resources"> - <filter filtersfile="${filter.dir}/${db}.filter"/> - <mkdir dir="${testclasses.dir}"/> - <copy todir="${testclasses.dir}" filtering="true" overwrite="true"> - <fileset dir="${test.resources.dir}"> - <include name="*.properties"/> - <include name="*.xml"/> - </fileset> - </copy> - </target> - - <target name="instrument" depends="compiletest" - description="Instrument the persistent classes">  - - <taskdef name="instrument" - classname="org.hibernate.tool.instrument.javassist.InstrumentTask"> - <classpath refid="junit.classpath"/> - </taskdef> - - <instrument verbose="true"> - <fileset dir="${testclasses.dir}/org/hibernate/test"> - <include name="**/*.class"/> - <exclude name="**/*Test$*.class"/> - <exclude name="**/*Test.class"/> - <exclude name="**/*Tests.class"/> - </fileset> - </instrument> - </target> - - <target name="junitinstrument" depends="compiletest,instrument" - description="Run the instrument test suite"> - <for list="${targetdb}" param="db"> - <sequential> - <antcall target="test-resources"> - <param name="db" value="@{db}"/> - </antcall> - <mkdir dir="${instrumenttest.out.dir}/@{db}"/> - <echo>Running against db: @{db}</echo> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" - maxmemory="256M" fork="yes" forkmode="perBatch"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest todir="${instrumenttest.out.dir}/@{db}" haltonfailure="no"> - <fileset refid="junit.batchtestset"/> - </batchtest> - </junit> - </sequential> - </for> - </target> - - <target name="junitreport" depends=""> - <junitreport todir="${testreports.dir}"> - <fileset dir="${testreports.dir}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${testreports.dir}"/> - </junitreport> - </target> - - <target name="checkstyle" description="Check coding style"> - <taskdef resource="checkstyletask.properties"> - <classpath> - <path refid="lib.class.path"/> - <fileset dir="${common-build.basedir}/lib"> - <include name="checkstyle*.jar"/> - </fileset> - </classpath> - </taskdef> - - <checkstyle config="${common-build.basedir}/checkstyle_checks.xml"> - <fileset dir="${src.dir}"> - <include name="**/*.java"/> - </fileset> - <formatter type="plain"/> - </checkstyle> - </target> - - <target name="patch" depends="checkstyle" description="Create a patch"> - <cvs command="-q diff -u -N" output="patch.txt"/> - </target> - -  - <target name="deploy" depends="jar"> - <fail unless="offline.repository.jboss.org" - message="offline.repository.jboss.org must be defined"/> - <jar jarfile="${src.jar}" basedir="${src.dir}"> - <include name="**/*.java"/> - <exclude name="**/test/*.java"/> -  - </jar> - - <artifact:pom id="maven.project" file="${pom.file}"/> - - <artifact:install file="${jar.file.name}"> - <pom refid="maven.project"/> - </artifact:install> - - <artifact:deploy file="${jar.file.name}"> - <pom refid="maven.project"/> - <remoteRepository refId="offline.repository.jboss.org"> - </remoteRepository> - <attach file="${src.jar}" classifier="sources"/> - <attach file="${jar.file.name}" classifier=""/> - </artifact:deploy> - </target> - -</project> \ No newline at end of file Deleted: core/trunk/annotations/ivy.xml =================================================================== --- core/trunk/annotations/ivy.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/ivy.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivy-module version="1.3" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation= - "http://www.jayasoft.org/misc/ivy/ivy.xsd"> - <info organisation="org.hibernate" module="annotations"/> - <configurations> - <conf name="default" description="Core module dependencies"/> - <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/> - </configurations> - <publications> - <artifact name="hibernate-annotations" conf="default"/> - </publications> - <dependencies> -  - <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/> - <dependency name="commons-annotations" rev="3.1.0.GA" conf="default->default"/> - <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.SP1" conf="default->default"/> - <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="default->default"/> - <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/> - - -  - <dependency org="antlr" name="antlr" rev="2.7.6" conf="test->default"/> - <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="test->default"/> - -  - <dependency org="javassist" name="javassist" rev="3.4.GA" conf="test->default"/> - <dependency org="asm" name="asm" rev="1.5.3" conf="test->default"/> - <dependency org="asm" name="asm-attrs" rev="1.5.3" conf="test->default"/> - <dependency org="javax.transaction" name="jta" rev="1.1" conf="test->default"/> - <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.2" conf="test->default"/> - <dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/> - <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/> - <dependency org="hsqldb" name="hsqldb" rev="1.8.0.2" conf="test->default"/> - <dependency org="postgresql" name="postgresql" rev="8.3-603.jdbc3" conf="test->default"/> - <dependency org="mysql" name="mysql-connector-java" rev="5.1.6" conf="test->default"/> - </dependencies> -</ivy-module> \ No newline at end of file Deleted: core/trunk/annotations/lgpl.txt =================================================================== --- core/trunk/annotations/lgpl.txt 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/lgpl.txt 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - Modified: core/trunk/annotations/pom.xml =================================================================== --- core/trunk/annotations/pom.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/pom.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,52 +1,364 @@ <?xml version="1.0"?> -<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/maven-v4_0_0.xsd" -> - <modelVersion>4.0.0</modelVersion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <packaging>jar</packaging> - <version>@version@</version> + +<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"> - <name>Hibernate Annotations</name> - <description>Annotations metadata for Hibernate</description> - <url>http://annotations.hibernate.org</url> + <modelVersion>4.0.0</modelVersion> - <licenses> - <license> - <name>GNU LESSER GENERAL PUBLIC LICENSE</name> - <url>http://www.gnu.org/licenses/lgpl.txt</url> - </license> - </licenses> + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <version>3.4.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - <version>1.0.2.GA</version> - </dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <packaging>jar</packaging> + + <name>Hibernate Annotations</name> + <description>Annotations metadata for Hibernate</description> + +  + <issueManagement> + <system>jira</system> + <url>http://opensource.atlassian.com/projects/hibernate/browse/ANN</url> + </issueManagement> + + <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>3.1.0.GA</version> - </dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.0.SP1</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.4.2</version> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> </dependency> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>test</scope> + </dependency> </dependencies> -</project> \ No newline at end of file + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <testResources> + <testResource> + <filtering>false</filtering> + <directory>src/test/java</directory> + <includes> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + </testResources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-test-ext-plugin</artifactId> + <version>1.1.0</version> + <executions> + <execution> + <goals> + <goal>extend</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + + <profiles> +  + <profile> + <id>hsqldb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect> + <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver> + <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url> + <jdbc.user>sa</jdbc.user> + <jdbc.pass /> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>h2</id> + <dependencies> + <dependency> + <groupId>org.h2database</groupId> + <artifactId>h2database</artifactId> + <version>1.0.20061217</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect> + <jdbc.driver>org.h2.Driver</jdbc.driver> + <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url> + <jdbc.user>sa</jdbc.user> + <jdbc.pass /> + <jdbc.isolation /> + </properties> + </profile> + +  + +  + <profile> + <id>mysql5</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>pgsql8</id> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504</version> + <classifier>jdbc3</classifier> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> + <jdbc.driver>org.postgresql.Driver</jdbc.driver> + <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + +  + <profile> + <id>oracle9i</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> +  + <version>10.0.2.0</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>oracle10g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> +  + <version>10.0.2.0</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>db2-8</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.1.57</version> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.1.57</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> + <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> + <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>hiber</jdbc.user> + <jdbc.pass>hiber</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>sybase12</id> + <dependencies> + <dependency> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect> + <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> + <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>sqlserver-jtds</id> + <dependencies> + <dependency> + <groupId>net.sourceforge.jtds</groupId> + <artifactId>jtds</artifactId> + <version>1.2</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>sqlserver-msjdbc</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> + <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> + + </profiles> + +</project> Modified: core/trunk/annotations/src/main/java/org/hibernate/AnnotationException.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/AnnotationException.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/AnnotationException.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/AccessType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/AccessType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/AccessType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Any.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Any.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Any.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDef.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDef.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDef.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDefs.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDefs.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/AnyMetaDefs.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,10 +1,30 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.FIELD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/BatchSize.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/BatchSize.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/BatchSize.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Cache.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Cache.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Cache.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheModeType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheModeType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/CacheModeType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** @@ -5,7 +28,7 @@ * the Level 2 Cache. * * @author Emmanuel Bernard - * @author Carlos Gonz�lez-Cadenas + * @author Carlos Gonz�lez-Cadenas */ public enum CacheModeType { Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Cascade.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Cascade.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Cascade.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/CascadeType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/CascadeType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/CascadeType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Check.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Check.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Check.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionId.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionId.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionId.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/CollectionOfElements.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Columns.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Columns.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Columns.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.TYPE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Entity.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Entity.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Entity.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.TYPE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Fetch.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Fetch.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Fetch.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchMode.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchMode.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchMode.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Filter.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Filter.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Filter.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDef.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDef.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDef.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDefs.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDefs.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterDefs.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTable.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTable.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTable.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,27 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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 + */ + //$Id$ package org.hibernate.annotations; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTables.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTables.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FilterJoinTables.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Filters.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Filters.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Filters.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/FlushModeType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FlushModeType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/FlushModeType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** @@ -3,27 +26,27 @@ * Enumeration extending javax.persistence flush modes. * - * @author Carlos Gonz�lez-Cadenas + * @author Carlos Gonz�lez-Cadenas */ public enum FlushModeType { /** - * see {@link org.hibernate.FlushMode.ALWAYS} + * see {@link org.hibernate.FlushMode#ALWAYS} */ ALWAYS, /** - * see {@link org.hibernate.FlushMode.AUTO} + * see {@link org.hibernate.FlushMode#AUTO} */ AUTO, /** - * see {@link org.hibernate.FlushMode.COMMIT} + * see {@link org.hibernate.FlushMode#COMMIT} */ COMMIT, /** - * see {@link org.hibernate.FlushMode.NEVER} + * see {@link org.hibernate.FlushMode#NEVER} * @deprecated use MANUAL, will be removed in a subsequent release */ NEVER, /** - * see {@link org.hibernate.FlushMode.MANUAL} + * see {@link org.hibernate.FlushMode#MANUAL} */ MANUAL, Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/ForceDiscriminator.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/ForceDiscriminator.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/ForceDiscriminator.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/ForeignKey.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/ForeignKey.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/ForeignKey.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Formula.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Formula.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Formula.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Generated.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Generated.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Generated.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/GenerationTime.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/GenerationTime.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/GenerationTime.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerator.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerator.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerator.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerators.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerators.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/GenericGenerators.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Immutable.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Immutable.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Immutable.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Index.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Index.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Index.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/IndexColumn.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/IndexColumn.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/IndexColumn.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollection.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollection.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollection.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollectionOption.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollectionOption.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyCollectionOption.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOne.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOne.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOne.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOneOption.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOneOption.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/LazyToOneOption.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Loader.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Loader.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Loader.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.TYPE; @@ -10,7 +33,7 @@ /** * Loader Annotation for overwriting Hibernate default FIND method * - * @author L�szl� Benke + * @author L�szl� Benke */ @Target( {TYPE, FIELD, METHOD} ) @Retention( RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/ManyToAny.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/ManyToAny.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/ManyToAny.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.METHOD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKey.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKey.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKey.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.ElementType; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/MetaValue.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/MetaValue.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/MetaValue.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQueries.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQueries.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQueries.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQuery.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQuery.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedNativeQuery.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQueries.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQueries.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQueries.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.PACKAGE; @@ -11,7 +34,7 @@ * objects * * @author Emmanuel Bernard - * @author Carlos Gonz�lez-Cadenas + * @author Carlos Gonz�lez-Cadenas */ @Target({TYPE, PACKAGE}) @Retention(RUNTIME) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQuery.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQuery.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NamedQuery.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.PACKAGE; @@ -10,7 +32,7 @@ /** * Extends {@link javax.persistence.NamedQuery} with Hibernate features * - * @author Carlos Gonz�lez-Cadenas + * @author Carlos Gonz�lez-Cadenas */ @Target({TYPE, PACKAGE}) @Retention(RUNTIME) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NaturalId.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NaturalId.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NaturalId.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; @@ -10,7 +33,7 @@ /** * This specifies that a property is part of the natural id of the entity. * - * @author Nicol�s Lichtmaier + * @author Nicol�s Lichtmaier */ @Target( { METHOD, FIELD } ) @Retention( RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFound.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFound.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFound.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFoundAction.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFoundAction.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/NotFoundAction.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDelete.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDelete.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDelete.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDeleteAction.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDeleteAction.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/OnDeleteAction.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLock.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLock.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLock.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.ElementType; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLockType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLockType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/OptimisticLockType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/OrderBy.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/OrderBy.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/OrderBy.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/ParamDef.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/ParamDef.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/ParamDef.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Retention; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Parameter.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Parameter.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Parameter.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Retention; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Parent.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Parent.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Parent.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Persister.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Persister.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Persister.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/PolymorphismType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Proxy.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Proxy.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Proxy.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.TYPE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/ResultCheckStyle.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/ResultCheckStyle.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/ResultCheckStyle.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,10 +1,32 @@ -//$Id: +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** * Possible checks on Sql Insert, Delete, Update * - * @author L�szl� Benke + * @author L�szl� Benke */ public enum ResultCheckStyle { /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDelete.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDelete.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDelete.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id:$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.TYPE; @@ -11,7 +33,7 @@ /** * SqlDelete Annotation for overwriting Hibernate default DELETE method * - * @author L�szl� Benke + * @author L�szl� Benke */ @Target( {TYPE, FIELD, METHOD} ) @Retention( RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDeleteAll.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDeleteAll.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLDeleteAll.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; @@ -12,7 +34,7 @@ /** * SqlDelete Annotation for overwriting Hibernate default DELETE ALL method * - * @author L�szl� Benke + * @author L�szl� Benke */ @Target( {TYPE, FIELD, METHOD} ) @Retention( RetentionPolicy.RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLInsert.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLInsert.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLInsert.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id:$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.TYPE; @@ -11,7 +33,7 @@ /** * SqlInsert Annotation for overwriting Hibernate default INSERT INTO method * - * @author L�szl� Benke + * @author L�szl� Benke */ @Target( {TYPE, FIELD, METHOD} ) @Retention( RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLUpdate.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLUpdate.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/SQLUpdate.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id:$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.TYPE; @@ -11,7 +33,7 @@ /** * SqlUpdate Annotation for overwriting Hibernate default UPDATE method * - * @author L�szl� Benke + * @author L�szl� Benke */ @Target( {TYPE, FIELD, METHOD} ) @Retention( RUNTIME ) Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Sort.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Sort.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Sort.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/SortType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/SortType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/SortType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Table.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Table.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Table.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.TYPE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Tables.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Tables.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Tables.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.TYPE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Target.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Target.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Target.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Retention; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizer.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizer.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizer.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.*; @@ -16,6 +38,6 @@ public @interface Tuplizer { /** tuplizer implementation */ Class impl(); - /** either pojo, dynamic-map or dom4j� */ + /** either pojo, dynamic-map or dom4j� */ String entityMode() default "pojo"; } Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizers.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizers.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Tuplizers.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Retention; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Type.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Type.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Type.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.FIELD; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDef.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDef.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDef.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDefs.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDefs.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/TypeDefs.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.PACKAGE; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/Where.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/Where.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/Where.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import static java.lang.annotation.ElementType.*; Modified: core/trunk/annotations/src/main/java/org/hibernate/annotations/WhereJoinTable.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/WhereJoinTable.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/annotations/WhereJoinTable.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.annotations; import java.lang.annotation.Target; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.HashMap; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotatedClassType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotatedClassType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotatedClassType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -// $Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.io.File; @@ -22,6 +44,7 @@ import javax.persistence.Entity; import javax.persistence.MappedSuperclass; +import javax.persistence.Embeddable; import org.dom4j.Attribute; import org.dom4j.Document; @@ -33,6 +56,10 @@ import org.hibernate.Interceptor; import org.hibernate.MappingException; import org.hibernate.SessionFactory; +import org.hibernate.DuplicateMappingException; +import org.hibernate.engine.NamedQueryDefinition; +import org.hibernate.engine.NamedSQLQueryDefinition; +import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.annotations.AnyMetaDef; import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.annotations.common.reflection.XClass; @@ -46,6 +73,7 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; import org.hibernate.mapping.UniqueKey; +import org.hibernate.mapping.IdGenerator; import org.hibernate.util.JoinedIterator; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; @@ -81,7 +109,7 @@ public static final String ARTEFACT = "hibernate.mapping.precedence"; public static final String DEFAULT_PRECEDENCE = "hbm, class"; - private Map namedGenerators; + private Map<String,IdGenerator> namedGenerators; private Map<String, Map<String, Join>> joins; private Map<String, AnnotatedClassType> classTypes; private Set<String> defaultNamedQueryNames; @@ -184,35 +212,7 @@ } public ExtendedMappings createExtendedMappings() { - return new ExtendedMappings( - classes, - collections, - tables, - namedQueries, - namedSqlQueries, - sqlResultSetMappings, - defaultNamedQueryNames, - defaultNamedNativeQueryNames, - defaultSqlResulSetMappingNames, - defaultNamedGenerators, - imports, - secondPasses, - propertyReferences, - namingStrategy, - typeDefs, - filterDefinitions, - namedGenerators, - joins, - classTypes, - extendsQueue, - tableNameBinding, columnNameBindingPerTable, auxiliaryDatabaseObjects, - generatorTables, - tableUniqueConstraints, - mappedByResolver, - propertyRefResolver, - anyMetaDefs, - reflectionManager - ); + return new ExtendedMappingsImpl(); } @Override @@ -490,14 +490,14 @@ * Recursively builds a list of FkSecondPass instances ready to be processed in this order. * Checking all dependencies recursively seems quite expensive, but the original code just relied * on some sort of table name sorting which failed in certain circumstances. + * <p/> + * See <tt>ANN-722</tt> and <tt>ANN-730</tt> * * @param orderedFkSecondPasses The list containing the <code>FkSecondPass<code> instances ready * for processing. * @param isADependencyOf Our lookup data structure to determine dependencies between tables * @param startTable Table name to start recursive algorithm. * @param currentTable The current table name used to check for 'new' dependencies. - * - * @see ANN-722 ANN-730 */ private void buildRecursiveOrderedFkSecondPasses( List orderedFkSecondPasses, @@ -1070,4 +1070,202 @@ public ReflectionManager getReflectionManager() { return reflectionManager; } + + protected class ExtendedMappingsImpl extends MappingsImpl implements ExtendedMappings { +// private final Map<String, IdGenerator> namedGenerators; +// private final Map<String, Map<String, Join>> joins; +// private final Map<String, AnnotatedClassType> classTypes; +// private final Map<String, Properties> generatorTables; +// private final Map<Table, List<String[]>> tableUniqueConstraints; +// private final Map<String, String> mappedByResolver; +// private final Map<String, String> propertyRefResolver; +// private final ReflectionManager reflectionManager; +// private final Set<String> defaultNamedQueryNames; +// private final Set<String> defaultNamedNativeQueryNames; +// private final Set<String> defaultSqlResulSetMappingNames; +// private final Set<String> defaultNamedGenerators; +// private final Map<String, AnyMetaDef> anyMetaDefs; + + public void addDefaultGenerator(IdGenerator generator) { + this.addGenerator( generator ); + defaultNamedGenerators.add( generator.getName() ); + } + + public IdGenerator getGenerator(String name) { + return getGenerator( name, null ); + } + + public IdGenerator getGenerator(String name, Map<String, IdGenerator> localGenerators) { + if ( localGenerators != null ) { + IdGenerator result = localGenerators.get( name ); + if ( result != null ) { + return result; + } + } + return namedGenerators.get( name ); + } + + public void addGenerator(IdGenerator generator) { + if ( !defaultNamedGenerators.contains( generator.getName() ) ) { + IdGenerator old = namedGenerators.put( generator.getName(), generator ); + if ( old != null ) { + log.warn( "duplicate generator name {}", old.getName() ); + } + } + } + + public void addGeneratorTable(String name, Properties params) { + Object old = generatorTables.put( name, params ); + if ( old != null ) { + log.warn( "duplicate generator table: {}", name ); + } + } + + public Properties getGeneratorTableProperties(String name, Map<String, Properties> localGeneratorTables) { + if ( localGeneratorTables != null ) { + Properties result = localGeneratorTables.get( name ); + if ( result != null ) { + return result; + } + } + return generatorTables.get( name ); + } + + public Map<String, Join> getJoins(String entityName) { + return joins.get( entityName ); + } + + public void addJoins(PersistentClass persistentClass, Map<String, Join> joins) { + Object old = AnnotationConfiguration.this.joins.put( persistentClass.getEntityName(), joins ); + if ( old != null ) { + log.warn( "duplicate joins for class: {}", persistentClass.getEntityName() ); + } + } + + public AnnotatedClassType getClassType(XClass clazz) { + AnnotatedClassType type = classTypes.get( clazz.getName() ); + if ( type == null ) { + return addClassType( clazz ); + } + else { + return type; + } + } + + public AnnotatedClassType addClassType(XClass clazz) { + AnnotatedClassType type; + if ( clazz.isAnnotationPresent( Entity.class ) ) { + type = AnnotatedClassType.ENTITY; + } + else if ( clazz.isAnnotationPresent( Embeddable.class ) ) { + type = AnnotatedClassType.EMBEDDABLE; + } + else if ( clazz.isAnnotationPresent( MappedSuperclass.class ) ) { + type = AnnotatedClassType.EMBEDDABLE_SUPERCLASS; + } + else { + type = AnnotatedClassType.NONE; + } + classTypes.put( clazz.getName(), type ); + return type; + } + + public Map<Table, List<String[]>> getTableUniqueConstraints() { + return tableUniqueConstraints; + } + + public void addUniqueConstraints(Table table, List uniqueConstraints) { + List oldConstraints = tableUniqueConstraints.get( table ); + if ( oldConstraints == null ) { + oldConstraints = new ArrayList(); + tableUniqueConstraints.put( table, oldConstraints ); + } + oldConstraints.addAll( uniqueConstraints ); + } + + public void addMappedBy(String entityName, String propertyName, String inversePropertyName) { + mappedByResolver.put( entityName + "." + propertyName, inversePropertyName ); + } + + public String getFromMappedBy(String entityName, String propertyName) { + return mappedByResolver.get( entityName + "." + propertyName ); + } + + public void addPropertyReferencedAssociation(String entityName, String propertyName, String propertyRef) { + propertyRefResolver.put( entityName + "." + propertyName, propertyRef ); + } + + public String getPropertyReferencedAssociation(String entityName, String propertyName) { + return propertyRefResolver.get( entityName + "." + propertyName ); + } + + @Override + public void addUniquePropertyReference(String referencedClass, String propertyName) { + super.addUniquePropertyReference( referencedClass, propertyName ); + } + + @Override + public void addPropertyReference(String referencedClass, String propertyName) { + super.addPropertyReference( referencedClass, propertyName ); + } + + public ReflectionManager getReflectionManager() { + return reflectionManager; + } + + public void addDefaultQuery(String name, NamedQueryDefinition query) { + super.addQuery( name, query ); + defaultNamedQueryNames.add( name ); + } + + public void addDefaultSQLQuery(String name, NamedSQLQueryDefinition query) { + super.addSQLQuery( name, query ); + defaultNamedNativeQueryNames.add( name ); + } + + public void addDefaultResultSetMapping(ResultSetMappingDefinition definition) { + final String name = definition.getName(); + if ( !defaultSqlResulSetMappingNames.contains( name ) + && super.getResultSetMapping( name ) != null ) { + removeResultSetMapping( name ); + } + super.addResultSetMapping( definition ); + defaultSqlResulSetMappingNames.add( name ); + } + + @Override + public void addQuery(String name, NamedQueryDefinition query) throws DuplicateMappingException { + if ( !defaultNamedQueryNames.contains( name ) ) { + super.addQuery( name, query ); + } + } + + @Override + public void addResultSetMapping(ResultSetMappingDefinition definition) throws DuplicateMappingException { + if ( !defaultSqlResulSetMappingNames.contains( definition.getName() ) ) + super.addResultSetMapping( definition ); + } + + @Override + public void addSQLQuery(String name, NamedSQLQueryDefinition query) throws DuplicateMappingException { + if ( !defaultNamedNativeQueryNames.contains( name ) ) { + super.addSQLQuery( name, query ); + } + } + + public Map getClasses() { + return classes; + } + + public void addAnyMetaDef(AnyMetaDef defAnn) throws AnnotationException { + if ( anyMetaDefs.containsKey( defAnn.name() ) ) { + throw new AnnotationException( "Two @AnyMetaDef with the same name defined: " + defAnn.name() ); + } + anyMetaDefs.put( defAnn.name(), defAnn ); + } + + public AnyMetaDef getAnyMetaDef(String name) { + return anyMetaDefs.get( name ); + } + } } Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.HashMap; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import javax.persistence.JoinTable; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import javax.persistence.Column; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import org.hibernate.AssertionFailure; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.io.InputStream; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.io.Serializable; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import javax.persistence.DiscriminatorColumn; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.HashSet; @@ -10,7 +32,7 @@ import org.hibernate.AnnotationException; import org.hibernate.MappingException; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.mapping.Column; import org.hibernate.mapping.Join; import org.hibernate.mapping.PersistentClass; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,14 +1,31 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.Set; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; import org.hibernate.AnnotationException; import org.hibernate.MappingException; @@ -22,8 +39,6 @@ import org.hibernate.mapping.Join; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; /** * Allow annotation related mappings @@ -32,251 +47,113 @@ * * @author Emmanuel Bernard */ -public class ExtendedMappings extends Mappings { +public interface ExtendedMappings extends Mappings { - private final Logger log = LoggerFactory.getLogger( ExtendedMappings.class ); + /** + * Adds a default id generator. + * + * @param generator The id generator + */ + public void addDefaultGenerator(IdGenerator generator); - private final Map<String, IdGenerator> namedGenerators; - private final Map<String, Map<String, Join>> joins; - private final Map<String, AnnotatedClassType> classTypes; - private final Map<String, Properties> generatorTables; - private final Map<Table, List<String[]>> tableUniqueConstraints; - private final Map<String, String> mappedByResolver; - private final Map<String, String> propertyRefResolver; - private final ReflectionManager reflectionManager; - private final Set<String> defaultNamedQueryNames; - private final Set<String> defaultNamedNativeQueryNames; - private final Set<String> defaultSqlResulSetMappingNames; - private final Set<String> defaultNamedGenerators; - private final Map<String, AnyMetaDef> anyMetaDefs; - - ExtendedMappings( - Map classes, Map collections, Map tables, Map queries, Map sqlqueries, Map sqlResultSetMappings, - Set<String> defaultNamedQueryNames, Set<String> defaultNamedNativeQueryNames, - Set<String> defaultSqlResulSetMappingNames, Set<String> defaultNamedGenerators, Map imports, - List secondPasses, List propertyReferences, NamingStrategy namingStrategy, Map typeDefs, - Map filterDefinitions, Map namedGenerators, Map<String, Map<String, Join>> joins, Map<String, - AnnotatedClassType> classTypes, Map extendsQueue, Map<String, TableDescription> tableNameBinding, - Map<Table, ColumnNames> columnNameBindingPerTable, - final List auxiliaryDatabaseObjects, - Map<String, Properties> generatorTables, - Map<Table, List<String[]>> tableUniqueConstraints, - Map<String, String> mappedByResolver, - Map<String, String> propertyRefResolver, - Map<String, AnyMetaDef> anyMetaDefs, - ReflectionManager reflectionManager - ) { - super( - classes, - collections, - tables, - queries, - sqlqueries, - sqlResultSetMappings, - imports, - secondPasses, - propertyReferences, - namingStrategy, - typeDefs, - filterDefinitions, - extendsQueue, - auxiliaryDatabaseObjects, - tableNameBinding, - columnNameBindingPerTable - ); - this.namedGenerators = namedGenerators; - this.joins = joins; - this.classTypes = classTypes; - this.generatorTables = generatorTables; - this.tableUniqueConstraints = tableUniqueConstraints; - this.mappedByResolver = mappedByResolver; - this.propertyRefResolver = propertyRefResolver; - this.reflectionManager = reflectionManager; - this.defaultNamedQueryNames = defaultNamedQueryNames; - this.defaultNamedNativeQueryNames = defaultNamedNativeQueryNames; - this.defaultSqlResulSetMappingNames = defaultSqlResulSetMappingNames; - this.defaultNamedGenerators = defaultNamedGenerators; - this.anyMetaDefs = anyMetaDefs; - } - - public void addGenerator(IdGenerator generator) throws MappingException { - if ( !defaultNamedGenerators.contains( generator.getName() ) ) { - Object old = namedGenerators.put( generator.getName(), generator ); - if ( old != null ) log.warn( "duplicate generator name: {}", generator.getName() ); - } - } - - public void addJoins(PersistentClass persistentClass, Map<String, Join> joins) throws MappingException { - Object old = this.joins.put( persistentClass.getEntityName(), joins ); - if ( old != null ) log.warn( "duplicate joins for class: {}", persistentClass.getEntityName() ); - } - - public AnnotatedClassType addClassType(XClass clazz) { - AnnotatedClassType type; - if ( clazz.isAnnotationPresent( Entity.class ) ) { - type = AnnotatedClassType.ENTITY; - } - else if ( clazz.isAnnotationPresent( Embeddable.class ) ) { - type = AnnotatedClassType.EMBEDDABLE; - } - else if ( clazz.isAnnotationPresent( MappedSuperclass.class ) ) { - type = AnnotatedClassType.EMBEDDABLE_SUPERCLASS; - } - else { - type = AnnotatedClassType.NONE; - } - classTypes.put( clazz.getName(), type ); - return type; - } - /** - * get and maintain a cache of class type. - * A class can be an entity, a embedded objet or nothing. + * Retrieve the id-generator by name. + * + * @param name The generator name. + * @return The generator, or null. */ - public AnnotatedClassType getClassType(XClass clazz) { - AnnotatedClassType type = classTypes.get( clazz.getName() ); - if ( type == null ) { - return addClassType( clazz ); - } - else { - return type; - } - } + public IdGenerator getGenerator(String name); - public IdGenerator getGenerator(String name) { - return getGenerator( name, null ); - } - - public Map<String, Join> getJoins(String persistentClass) { - return joins.get( persistentClass ); - } - /** * Try to find the generator from the localGenerators * and then from the global generator list * - * @param name generator name - * @param localGenerators local generators to find to + * @param name generator name + * @param localGenerators local generators * @return the appropriate idgenerator or null if not found */ - public IdGenerator getGenerator(String name, Map<String, IdGenerator> localGenerators) { - if ( localGenerators != null ) { - IdGenerator result = localGenerators.get( name ); - if ( result != null ) return result; - } - return namedGenerators.get( name ); - } + public IdGenerator getGenerator(String name, Map<String, IdGenerator> localGenerators); - public void addGeneratorTable(String name, Properties params) { - Object old = generatorTables.put( name, params ); - if ( old != null ) log.warn( "duplicate generator table: {}", name ); - } + /** + * Add a generator. + * + * @param generator The generator to add. + */ + public void addGenerator(IdGenerator generator); - public Properties getGeneratorTableProperties(String name, Map<String, Properties> localGeneratorTables) { - if ( localGeneratorTables != null ) { - Properties result = localGeneratorTables.get( name ); - if ( result != null ) return result; - } - return generatorTables.get( name ); - } + /** + * Add a generator table properties. + * + * @param name The generator name + * @param params The generator table properties. + */ + public void addGeneratorTable(String name, Properties params); - public void addUniqueConstraints(Table table, List uniqueConstraints) { - List oldConstraints = tableUniqueConstraints.get( table ); - if ( oldConstraints == null ) { - oldConstraints = new ArrayList(); - tableUniqueConstraints.put( table, oldConstraints ); - } - oldConstraints.addAll( uniqueConstraints ); - } + /** + * Retrieve the properties related to a generator table. + * + * @param name generator name + * @param localGeneratorTables local generator tables + * @return The properties, or null. + */ + public Properties getGeneratorTableProperties(String name, Map<String, Properties> localGeneratorTables); - public Map<Table, List<String[]>> getTableUniqueConstraints() { - return tableUniqueConstraints; - } + /** + * Retrieve join metadata for a particular persistent entity. + * + * @param entityName The entity name + * @return The join metadata + */ + public Map<String, Join> getJoins(String entityName); - public void addMappedBy(String entityName, String propertyName, String inversePropertyName) { - mappedByResolver.put( entityName + "." + propertyName, inversePropertyName ); - } + /** + * Add join metadata for a persistent entity. + * + * @param persistentClass The persistent entity metadata. + * @param joins The join metadata to add. + * @throws MappingException + */ + public void addJoins(PersistentClass persistentClass, Map<String, Join> joins); - public String getFromMappedBy(String entityName, String propertyName) { - return mappedByResolver.get( entityName + "." + propertyName ); - } + /** + * Get and maintain a cache of class type. + * + * @param clazz The XClass mapping + * @return The class type. + */ + public AnnotatedClassType getClassType(XClass clazz); - public void addPropertyReferencedAssociation(String entityName, String propertyName, String propertyRef) { - propertyRefResolver.put( entityName + "." + propertyName, propertyRef ); - } + /** + * Add a class type. + * + * @param clazz The XClass mapping. + * @return The class type. + */ + public AnnotatedClassType addClassType(XClass clazz); - public String getPropertyReferencedAssociation(String entityName, String propertyName) { - return propertyRefResolver.get( entityName + "." + propertyName ); - } + public Map<Table, List<String[]>> getTableUniqueConstraints(); - @Override - public void addUniquePropertyReference(String referencedClass, String propertyName) { - super.addUniquePropertyReference( referencedClass, propertyName ); - } + public void addUniqueConstraints(Table table, List uniqueConstraints); - @Override - public void addPropertyReference(String referencedClass, String propertyName) { - super.addPropertyReference( referencedClass, propertyName ); - } + public void addMappedBy(String entityName, String propertyName, String inversePropertyName); - public ReflectionManager getReflectionManager() { - return reflectionManager; - } + public String getFromMappedBy(String entityName, String propertyName); - public void addDefaultQuery(String name, NamedQueryDefinition query) { - super.addQuery( name, query ); - defaultNamedQueryNames.add( name ); - } + public void addPropertyReferencedAssociation(String entityName, String propertyName, String propertyRef); - public void addDefaultSQLQuery(String name, NamedSQLQueryDefinition query) { - super.addSQLQuery( name, query ); - defaultNamedNativeQueryNames.add( name ); - } + public String getPropertyReferencedAssociation(String entityName, String propertyName); - public void addDefaultGenerator(IdGenerator idGen) { - this.addGenerator( idGen ); - defaultNamedGenerators.add( idGen.getName() ); + public ReflectionManager getReflectionManager(); - } + public void addDefaultQuery(String name, NamedQueryDefinition query); - public void addDefaultResultSetMapping(ResultSetMappingDefinition definition) { - final String name = definition.getName(); - if ( !defaultSqlResulSetMappingNames.contains( name ) - && super.getResultSetMapping( name ) != null ) { - resultSetMappings.remove( name ); - } - super.addResultSetMapping( definition ); - defaultSqlResulSetMappingNames.add( name ); - } + public void addDefaultSQLQuery(String name, NamedSQLQueryDefinition query); - @Override - public void addQuery(String name, NamedQueryDefinition query) throws MappingException { - if ( !defaultNamedQueryNames.contains( name ) ) super.addQuery( name, query ); - } + public void addDefaultResultSetMapping(ResultSetMappingDefinition definition); - @Override - public void addResultSetMapping(ResultSetMappingDefinition definition) { - if ( !defaultSqlResulSetMappingNames.contains( definition.getName() ) ) - super.addResultSetMapping( definition ); - } + public Map getClasses(); - @Override - public void addSQLQuery(String name, NamedSQLQueryDefinition query) throws MappingException { - if ( !defaultNamedNativeQueryNames.contains( name ) ) super.addSQLQuery( name, query ); - } + public void addAnyMetaDef(AnyMetaDef defAnn) throws AnnotationException; - public Map getClasses() { - return classes; - } - - public void addAnyMetaDef(AnyMetaDef defAnn) { - if ( anyMetaDefs.containsKey( defAnn.name() ) ) { - throw new AnnotationException( "Two @AnyMetaDef with the same name defined: " + defAnn.name() ); - } - anyMetaDefs.put( defAnn.name(), defAnn ); - } - - public AnyMetaDef getAnyMetaDef(String name) { - return anyMetaDefs.get( name ); - } + public AnyMetaDef getAnyMetaDef(String name); } \ No newline at end of file Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/FkSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/FkSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/FkSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.concurrent.atomic.AtomicInteger; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexColumn.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexColumn.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexColumn.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/InheritanceState.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/InheritanceState.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/InheritanceState.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/NotYetImplementedException.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/NotYetImplementedException.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/NotYetImplementedException.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import org.hibernate.MappingException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.Iterator; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyData.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyData.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyData.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import org.hibernate.MappingException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import javax.persistence.Column; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyInferredData.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyInferredData.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyInferredData.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import org.hibernate.MappingException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import org.hibernate.MappingException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/RecoverableException.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/RecoverableException.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/RecoverableException.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import org.hibernate.AnnotationException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.Map; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -// $Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import java.util.Iterator; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/WrappedInferredData.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/WrappedInferredData.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/WrappedInferredData.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg; import org.hibernate.MappingException; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import org.hibernate.mapping.Array; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/BagBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/BagBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/BagBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import org.hibernate.mapping.Collection; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import java.util.Collections; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ListBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ListBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ListBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import java.util.Map; @@ -8,7 +31,7 @@ import org.hibernate.annotations.Sort; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.cfg.CollectionSecondPass; import org.hibernate.cfg.Ejb3Column; import org.hibernate.cfg.Ejb3JoinColumn; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/MapBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/MapBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/MapBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import java.util.HashMap; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Nullability.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Nullability.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Nullability.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import org.hibernate.mapping.Collection; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import javax.persistence.EmbeddedId; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import java.util.HashMap; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SetBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SetBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SetBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import org.hibernate.annotations.OrderBy; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import java.io.Serializable; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/TableBinder.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/TableBinder.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/TableBinder.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import java.util.ArrayList; @@ -9,7 +31,7 @@ import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.annotations.Index; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.cfg.BinderHelper; import org.hibernate.cfg.Ejb3JoinColumn; import org.hibernate.cfg.ExtendedMappings; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Version.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Version.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/Version.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations; import org.slf4j.Logger; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations.reflection; import java.beans.Introspector; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations.reflection; import java.lang.reflect.AnnotatedElement; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.annotations.reflection; import java.util.ArrayList; Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -// $Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.cfg.search; import java.util.Properties; Modified: core/trunk/annotations/src/main/java/org/hibernate/ejb/orm_1_0.xsd =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/ejb/orm_1_0.xsd 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/ejb/orm_1_0.xsd 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + +  <xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" Modified: core/trunk/annotations/src/main/java/org/hibernate/mapping/IdGenerator.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/mapping/IdGenerator.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/mapping/IdGenerator.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.mapping; import java.io.Serializable; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/AbstractLobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/AbstractLobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/AbstractLobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.type; import java.io.Serializable; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/ByteArrayBlobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.type; import java.io.ByteArrayInputStream; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/CharacterArrayClobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.type; import java.io.CharArrayReader; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/EnumType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/EnumType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/EnumType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.type; import java.io.IOException; @@ -15,7 +37,7 @@ import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.annotations.common.util.StringHelper; +import org.hibernate.util.StringHelper; import org.hibernate.usertype.EnhancedUserType; import org.hibernate.usertype.ParameterizedType; import org.hibernate.util.ReflectHelper; @@ -25,10 +47,10 @@ /** * Enum type mapper * Try and find the appropriate SQL type depending on column metadata - * + * <p/> + * TODO implements readobject/writeobject to recalculate the enumclasses * @author Emmanuel Bernard */ -//TODO implements readobject/writeobject to recalculate the enumclasses public class EnumType implements EnhancedUserType, ParameterizedType, Serializable { /** * This is the old scheme where logging of parameter bindings and value extractions Modified: core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveByteArrayBlobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.type; /** Modified: core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/PrimitiveCharacterArrayClobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.type; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/SerializableToBlobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/SerializableToBlobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/SerializableToBlobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.type; import java.io.ByteArrayInputStream; Modified: core/trunk/annotations/src/main/java/org/hibernate/type/StringClobType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/type/StringClobType.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/main/java/org/hibernate/type/StringClobType.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, 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.type; import java.io.IOException; Modified: core/trunk/annotations/src/test/resources/hibernate.properties =================================================================== --- core/trunk/annotations/src/test/resources/hibernate.properties 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/annotations/src/test/resources/hibernate.properties 2008-10-28 21:41:58 UTC (rev 15428) @@ -1,301 +1,39 @@ -###################### -### Query Language ### -###################### +# +# Hibernate, Relational Persistence for Idiomatic Java +# +# Copyright (c) 2008, 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 +# +hibernate.dialect ${db.dialect} +hibernate.connection.driver_class ${jdbc.driver} +hibernate.connection.url ${jdbc.url} +hibernate.connection.username ${jdbc.user} +hibernate.connection.password ${jdbc.pass} +hibernate.connection.isolation ${jdbc.isolation} -## define query language constants / function names +hibernate.connection.pool_size 5 -hibernate.query.substitutions true 1, false 0, yes 'Y', no 'N' - - -## select the classic query parser - -#hibernate.query.factory_class org.hibernate.hql.classic.ClassicQueryTranslatorFactory - +hibernate.show_sql true hibernate.format_sql true +hibernate.max_fetch_depth 5 - -################# -### Platforms ### -################# - -hibernate.dialect @hibernate.dialect@ -hibernate.connection.driver_class @hibernate.connection.driver_class@ -hibernate.connection.username @hibernate.connection.username@ -hibernate.connection.password @hibernate.connection.password@ -hibernate.connection.url @hibernate.connection.url@ - -################################# -### Hibernate Connection Pool ### -################################# - -hibernate.connection.pool_size 1 - -########################### -### C3P0 Connection Pool### -########################### - -#hibernate.c3p0.max_size 2 -#hibernate.c3p0.min_size 2 -#hibernate.c3p0.timeout 5000 -#hibernate.c3p0.max_statements 100 -#hibernate.c3p0.idle_test_period 3000 -#hibernate.c3p0.acquire_increment 2 -#hibernate.c3p0.validate false - -############################## -### Proxool Connection Pool### -############################## - -## Properties for external configuration of Proxool - -hibernate.proxool.pool_alias pool1 - -## Only need one of the following - -#hibernate.proxool.existing_pool true -#hibernate.proxool.xml proxool.xml -#hibernate.proxool.properties proxool.properties - - - -################################# -### Plugin ConnectionProvider ### -################################# - -## use a custom ConnectionProvider (if not set, Hibernate will choose a built-in ConnectionProvider using hueristics) - -#hibernate.connection.provider_class org.hibernate.connection.DriverManagerConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.DBCPConnectionProvider -#hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider - - - -####################### -### Transaction API ### -####################### - -## Enable automatic flush during the JTA beforeCompletion() callback -## (This setting is relevant with or without the Transaction API) - -#hibernate.transaction.flush_before_completion - - -## Enable automatic session close at the end of transaction -## (This setting is relevant with or without the Transaction API) - -#hibernate.transaction.auto_close_session - - -## the Transaction API abstracts application code from the underlying JTA or JDBC transactions - -#hibernate.transaction.factory_class org.hibernate.transaction.JTATransactionFactory -#hibernate.transaction.factory_class org.hibernate.transaction.JDBCTransactionFactory - - -## to use JTATransactionFactory, Hibernate must be able to locate the UserTransaction in JNDI -## default is java:comp/UserTransaction -## you do NOT need this setting if you specify hibernate.transaction.manager_lookup_class - -#jta.UserTransaction jta/usertransaction -#jta.UserTransaction javax.transaction.UserTransaction -#jta.UserTransaction UserTransaction - - -## to use the second-level cache with JTA, Hibernate must be able to obtain the JTA TransactionManager - -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.JBossTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.WeblogicTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.WebSphereTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.OrionTransactionManagerLookup -#hibernate.transaction.manager_lookup_class org.hibernate.transaction.ResinTransactionManagerLookup - - - -############################## -### Miscellaneous Settings ### -############################## - -## print all generated SQL to the console - -#hibernate.show_sql true - - -## add comments to the generated SQL - -#hibernate.use_sql_comments true - - -## generate statistics - -#hibernate.generate_statistics true - - -## auto schema export - -#hibernate.hbm2ddl.auto create-drop -#hibernate.hbm2ddl.auto create -#hibernate.hbm2ddl.auto update - - -## specify a default schema and catalog for unqualified tablenames - -#hibernate.default_schema test -#hibernate.default_catalog test - - -## enable ordering of SQL UPDATEs by primary key - -hibernate.order_updates true - - -## set the maximum depth of the outer join fetch tree - -hibernate.max_fetch_depth 1 - - -## set the default batch size for batch fetching - -hibernate.default_batch_fetch_size 100 - - -## rollback generated identifier values of deleted entities to default values - -#hibernate.use_identifer_rollback true - - -## enable CGLIB reflection optimizer (enabled by default) - -#hibernate.cglib.use_reflection_optimizer false - - - -##################### -### JDBC Settings ### -##################### - -## specify a JDBC isolation level - -#hibernate.connection.isolation 4 - - -## enable JDBC autocommit (not recommended!) - -#hibernate.connection.autocommit true - - -## set the JDBC fetch size - -#hibernate.jdbc.fetch_size 25 - - -## set the maximum JDBC 2 batch size (a nonzero value enables batching) - -#hibernate.jdbc.batch_size 0 - - -## enable batch updates even for versioned data - -hibernate.jdbc.batch_versioned_data true - - -## enable use of JDBC 2 scrollable ResultSets (specifying a Dialect will cause Hibernate to use a sensible default) - -#hibernate.jdbc.use_scrollable_resultset true - - -## use streams when writing binary types to / from JDBC - -hibernate.jdbc.use_streams_for_binary true - - -## use JDBC 3 PreparedStatement.getGeneratedKeys() to get the identifier of an inserted row - -#hibernate.jdbc.use_get_generated_keys false - - -## choose a custom JDBC batcher - -# hibernate.jdbc.factory_class - - -## enable JDBC result set column alias caching -## (minor performance enhancement for broken JDBC drivers) - -# hibernate.jdbc.wrap_result_sets - - -## choose a custom SQL exception converter - -#hibernate.jdbc.sql_exception_converter - - - -########################## -### Second-level Cache ### -########################## - -## optimize chache for minimal "puts" instead of minimal "gets" (good for clustered cache) - -#hibernate.cache.use_minimal_puts true - - -## set a prefix for cache region names - hibernate.cache.region_prefix hibernate.test - - -## disable the second-level cache - -#hibernate.cache.use_second_level_cache false - - -## enable the query cache - -hibernate.cache.use_query_cache true - - -## store the second-level cache entries in a more human-friendly format - -#hibernate.cache.use_structured_entries true - - -## choose a cache implementation - -#hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.EmptyCacheProvider -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.TreeCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.OSCacheProvider -#hibernate.cache.provider_class org.hibernate.cache.SwarmCacheProvider - - -## choose a custom query cache implementation - -#hibernate.cache.query_cache_factory - - - -############ -### JNDI ### -############ - -## specify a JNDI name for the SessionFactory - -#hibernate.session_factory_name hibernate/session_factory - - -## Hibernate uses JNDI to bind a name to a SessionFactory and to look up the JTA UserTransaction; -## if hibernate.jndi.* are not specified, Hibernate will use the default InitialContext() which -## is the best approach in an application server - -#file system -#hibernate.jndi.class com.sun.jndi.fscontext.RefFSContextFactory -#hibernate.jndi.url file:/ - -#WebSphere -#hibernate.jndi.class com.ibm.websphere.naming.WsnInitialContextFactory -#hibernate.jndi.url iiop://localhost:900/ - +hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider \ No newline at end of file Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2008-10-28 21:41:58 UTC (rev 15428) @@ -2488,7 +2488,10 @@ if ( old != null ) { throw new DuplicateMappingException( "resultSet", sqlResultSetMapping.getName() ); } + } + protected void removeResultSetMapping(String name) { + sqlResultSetMappings.remove( name ); } public TypeDef getTypeDef(String typeName) { Modified: core/trunk/envers/pom.xml =================================================================== --- core/trunk/envers/pom.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/envers/pom.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -75,63 +75,17 @@ </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <exclusions> -  - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - </exclusion> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm-attrs</artifactId> - </exclusion> - </exclusions> + <artifactId>hibernate-commons-annotations</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <exclusions> -  - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - </exclusion> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm-attrs</artifactId> - </exclusion> - </exclusions> + <artifactId>hibernate-annotations</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> <exclusions> -  +  <exclusion> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> @@ -196,17 +150,15 @@ <artifactId>persistence-api</artifactId> <version>1.0</version> </dependency> -  <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.3.0.ga</version> + <version>${version}</version> </dependency> -  <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> - <version>3.3.0.ga</version> + <version>${version}</version> </dependency>  <dependency> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2008-10-28 19:16:51 UTC (rev 15427) +++ core/trunk/pom.xml 2008-10-28 21:41:58 UTC (rev 15428) @@ -55,6 +55,7 @@ <module>connection-c3p0</module> <module>connection-proxool</module> <module>commons-annotations</module> + <module>annotations</module> <module>envers</module> <module>jmx</module> <module>testing</module>

16 years, 2 months

1
0
0 / 0

← Newer
1
2
3
4
5
6
7
8
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits October 2008