Commit Graph

228 Commits

Author SHA1 Message Date
Adam Warski f434cd4311 HHH-6605: Fixing problems with lazy proxy initialization 2012-01-20 22:46:36 +01:00
Adam Warski 89bb7ec175 HHH-6605: More conflicts merging 2012-01-20 20:57:40 +01:00
Adam Warski a00f23c6f6 Merge remote-tracking branch 'origin/master'
Conflicts:
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java
2012-01-20 20:52:41 +01:00
Adam Warski b109633b66 HHH-6605: Merging changes by Michal Skowronek. Thanks! Merge remote-tracking branch 'mskowron/change_info'
Conflicts:
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ComponentMetadataGenerator.java
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java
	hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesReader.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java
	hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversCollectionEventListener.java
	hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java
	hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java
	hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java
	hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java
	hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/FakeBidirectionalRelationWorkUnit.java
	hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractOneSessionTest.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractSessionTest.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java
	hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java
2012-01-20 20:47:12 +01:00
Lukasz Antoniak 81ee788466 Merge pull request #246 from lukasz-antoniak/HHH-6825
HHH-6825 - AuditException with @OneToOne-mappedBy and @PrimaryKeyJoinColumn
2012-01-18 11:41:05 -08:00
Lukasz Antoniak 10f48ef973 HHH-6825 - Renaming simple entity descriptor 2012-01-16 15:10:47 +01:00
Steve Ebersole e75b8a77b1 HHH-6967 - HHH-6906 - Clean up javadoc warnings 2012-01-13 11:17:34 -06:00
Strong Liu 8f9d8b530e HHH-6964 EnversIntegrator is always detected by default while initializing Serviceregistry using Native Hibernate API causing a MappingException even when Envers is not used 2012-01-13 04:09:01 +08:00
Strong Liu e07aff45da HHH-6964 EnversIntegrator is always detected by default while initializing Serviceregistry using Native Hibernate API causing a MappingException even when Envers is not used 2012-01-13 03:44:30 +08:00
Adam Warski aa33b57242 Including the actual exception if an AuditStrategy can't be created 2012-01-12 20:12:43 +01:00
Lukasz Antoniak fbfc133af8 HHH-6825 - Formatting and Javadoc change 2012-01-10 20:34:39 +01:00
Lukasz Antoniak c703d134f2 HHH-6825 - ToOne property mappers refactoring 2012-01-10 20:08:43 +01:00
lukasz-antoniak 0efd1dd886 Merge pull request #244 from lukasz-antoniak/HHH-4439
HHH-4439 - Override auditing behavior of properties defined in @MappedSuperclass
2012-01-09 12:43:45 -08:00
Lukasz Antoniak 53b32e9e8d HHH-4439 - Javadoc change 2012-01-09 21:18:57 +01:00
Lukasz Antoniak 05df3d8638 HHH-4439 - Test and Javadoc change 2012-01-06 15:20:27 +01:00
Lukasz Antoniak 1293253412 HHH-4439 - Javadoc change 2012-01-06 14:37:24 +01:00
Lukasz Antoniak 0a08780e13 HHH-4439 - Deprecate Audited.auditParents 2012-01-06 14:14:07 +01:00
Lukasz Antoniak 5c80268664 HHH-6825 - Fix and test 2012-01-04 21:10:53 +01:00
Michael Rudolf 875a4b29dd HHH-5891: Added ordering clause to query generated by getRevisions() to fulfill guarantee given in JavaDoc. 2012-01-04 17:25:58 +01:00
Steve Ebersole ab94a18c33 HHH-6931 - Provide local database hook 2012-01-03 20:43:15 -06:00
Lukasz Antoniak a49e02b239 HHH-4439 - Patch and test 2011-12-25 18:42:08 +01:00
Strong Liu ff9eb6d1b2 test need to be compiled in UTF-8 2011-11-21 10:16:30 +08:00
Steve Ebersole d4e138eb13 HHH-6833 - Eable SQL logging for tests 2011-11-20 10:27:47 -06:00
Adam Warski 199f3e300c Merge pull request #204 from lukasz-antoniak/HHH-6753
HHH-6753 - Envers WorkUnits: Problems with merge
2011-11-08 03:07:56 -08:00
Emmanuel Bernard 53cae7ace7 HHH-6799 Fix EntityManager relates test harness that was closing a ServiceRegistry it did not open 2011-11-03 21:20:28 +01:00
Adam Warski 946925f3e2 HHH-6793: checking if session isn't closed 2011-11-02 11:44:36 +01:00
Adam Warski 653211da6c HHH-6784: only adding the REVINFO table if there are any audited entities. 2011-10-29 13:31:31 +02:00
Lukasz Antoniak 4d3620342b HHH-6753 - JavaDoc changed 2011-10-29 00:57:57 +02:00
Lukasz Antoniak fe2d1fe0ea HHH-6753 - Fix and test 2011-10-29 00:44:10 +02:00
Adam Warski 4de4bad98a Merge pull request #202 from lukasz-antoniak/HHH-3843
HHH-3843 - NonUniqueObjectException exception while auditing parent with @ManyToMany relation
2011-10-25 07:35:31 -07:00
Strong Liu bdba5898c9 clean up imports 2011-10-24 16:26:37 +08:00
Lukasz Antoniak 26102b0574 HHH-3843 - Organize imports 2011-10-22 11:23:00 +02:00
Lukasz Antoniak 6a89afccb6 HHH-3843 - Refactoring, test simplified 2011-10-22 11:20:46 +02:00
Lukasz Antoniak 86482c630b HHH-3843 - Fix and test 2011-10-19 20:07:49 +02:00
Lukasz Antoniak 8dd9c79ebd HHH-6636 - Comment change 2011-10-19 19:43:12 +02:00
Lukasz Antoniak 9fff9862b9 HHH-6636 - Fix and test 2011-10-19 19:34:54 +02:00
Strong Liu c84fb01c22 HHH-6740 run envers tests on db matrix 2011-10-18 12:29:45 +08:00
Michal Skowronek 1c7532f875 HHH-6605 - Added Mod Flags suffix configurability 2011-10-11 20:19:44 +02:00
Michal Skowronek 43a602b100 HHH-6605 - Removed some duplication in mappers code 2011-10-11 20:19:44 +02:00
Michal Skowronek 726571b270 HHH-6605 - Removed OVERRIDE_USING_MODIFIED_FLAG_PROPERTY global property 2011-10-11 20:19:44 +02:00
Michal Skowronek fcb57dd17f HHH-6605 - Moved extractRevisionNumbers test method to TestTools class 2011-10-11 20:19:44 +02:00
Michal Skowronek d7904dbf0d Moved Test logic to separate classes
Added new test cases
Merge logic for CollectionChangeWorkUnits
2011-10-11 20:19:44 +02:00
Michal Skowronek 313bb01c50 Fix for failing tests 2011-10-11 20:19:43 +02:00
Michal Skowronek 9c4b385bdb Modified Flags feature - tracking changes on property level
Extended some of already existing test cases
More units to add
2011-10-11 20:19:43 +02:00
Strong Liu 7b1c172b84 HHH-6716 envers should set the TCCL to the envers classloader before constructing a dom4j instance. This will allow applications to use their own version of dom4j 2011-10-08 15:03:14 +08:00
Adam Warski 9039e4d29e HHH-6696: additional javadoc explanation 2011-10-01 10:40:11 +02:00
Lukasz Antoniak b622119104 HHH-6696 - Typical test case 2011-09-30 16:58:06 +02:00
Lukasz Antoniak 45f3ced6da HHH-6696 - RevisionListener class configuration parameter 2011-09-29 20:50:07 +02:00
Steve Ebersole e14e47968f HHH-6683 - Consolidate (consistency) building of service registries 2011-09-27 12:45:07 -05:00
Steve Ebersole f4fa176255 HHH-6683 - Consolidate (consistency) building of service registries 2011-09-27 11:49:17 -05:00