Commit Graph

401 Commits

Author SHA1 Message Date
Strong Liu b9249e548a merge master 2013-05-06 22:55:00 +08:00
Strong Liu 72291316fc HHH-8221 - mocking orm.xml is not processed well 2013-05-03 18:28:17 +08:00
Steve Ebersole 3275855c5b HHH-8159 - Apply fixups indicated by analysis tools 2013-05-02 10:11:59 -05:00
Steve Ebersole ad1d1ab8b4 HHH-8159 - Apply fixups indicated by analysis tools 2013-05-01 22:42:16 -05:00
Brett Meyer 60513d2e2e HHH-7995 Pushing class missed in previous commit 2013-05-01 15:05:31 -04:00
Steve Ebersole a1d190d674 HHH-8159 - Apply fixups indicated by analysis tools 2013-05-01 09:23:52 -05:00
Brett Meyer 04fe84994d HHH-7995 Added support for TypeContributors in OSGi. Integrated with
envers
Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
	hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
	hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiPersistenceProvider.java
	hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiSessionFactoryService.java
2013-05-01 00:05:03 -04:00
Brett Meyer 0edd7b75b8 HHH-7943 C3P0 and Proxool OSGi support 2013-04-29 11:51:02 -04:00
Steve Ebersole 194cd5e4bd HHH-8159 - Apply fixups indicated by analysis tools 2013-04-29 09:55:39 -05:00
Steve Ebersole eaef21076d HHH-8159 - Apply fixups indicated by analysis tools 2013-04-25 17:38:43 -05:00
Strong Liu a0ccbb425b merge master 2013-04-22 15:19:35 +08:00
Gail Badner 073bb53c8f HHH-7841 - Redesign Loader 2013-04-18 14:23:33 -07:00
Steve Ebersole 3600ffb7f2 HHH-7841 - Redesign Loader 2013-04-18 12:47:18 -05:00
Steve Ebersole 8eeef7af3b HHH-8146 - Update to use maven-publishing plugin 2013-04-16 18:26:02 -05:00
Brett Meyer 079fd4ac01 HHH-8160 Corrected Import-Package in module manifests 2013-04-16 10:29:44 -04:00
Strong Liu c68cca809a HHH-8187 - Integrate JPA Metamodel with hibernate new metamodel 2013-04-16 14:13:34 +08:00
Steve Ebersole fafce001e7 HHH-7841 - Redesign Loader 2013-04-15 20:46:18 -05:00
Steve Ebersole 8429d2bcb8 HHH-8173 - AvailableSettings constants for javax.persistence.schema-generation contain space 2013-04-15 10:36:17 -05:00
Strong Liu a448e268e0 HHH-8184 association attributes from mapped super class are not included 2013-04-15 21:56:35 +08:00
Strong Liu f29a670378 merge master 2013-04-15 18:33:46 +08:00
Steve Ebersole 8bca70e6a9 HHH-7841 - Redesign Loader 2013-04-12 14:08:35 -05:00
Zbyněk Roubalík 03daecfe49 Test fix: em2 should be closed before we do latch.countDown() 2013-04-11 19:52:34 -04:00
Steve Ebersole 87012e8101 HHH-8077 - Add MDC usage into attribute walking to help decode logs from recursive calls 2013-04-11 14:31:25 -05:00
Strong Liu de070e11ca HHH-8169 - rework on binding jpa entity listener 2013-04-10 23:13:47 +08:00
Brett Meyer cc4ef44670 HHH-8160 Updated for Gradle 1.5 OSGi plugin changes and package
versioning issues
2013-04-09 09:57:36 -04:00
Strong Liu 68720548c8 merge master 2013-04-06 12:30:53 +08:00
Steve Ebersole 378fc1378a HHH-8143 - Create a 'generateSources' task that performs all generation tasks 2013-04-04 14:45:49 -05:00
Steve Ebersole 26868ad314 HHH-8141 - Upgrade to Gradle 1.5 2013-04-04 13:01:39 -05:00
Steve Ebersole 907a2750b6 HHH-8138 - Log SQLException in DatabaseTarget with cause of schema export CREATE statement failure 2013-04-04 07:51:18 -05:00
Steve Ebersole 442c3268b3 HHH-8113 - Persistence.createEntityManagerFactory() should run schema export if JPA properties are set 2013-04-03 11:20:52 -05:00
Steve Ebersole 2f40949719 HHH-8129 - Unify BaseQueryImpl and AbstractQueryImpl hierarchies 2013-04-03 10:52:52 -05:00
Strong Liu bae5a85c26 HHH-8127 OutOfMemoryError when running tests
Conflicts:
	hibernate-core/src/test/java/org/hibernate/cfg/beanvalidation/ApplySchemaConstraintTest.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java
2013-04-03 10:27:38 -04:00
Steve Ebersole ea8f587800 HHH-8121 - Make property-able JPA settings defined in persistence.xml available in EMF.getProperties() 2013-04-02 20:39:37 -05:00
Steve Ebersole 076e17e5b1 HHH-7957 - Integrate Latest draft(s) of the JPA 2.1 spec 2013-04-02 20:10:44 -05:00
Steve Ebersole 8316367683 HHH-8113 - Persistence.createEntityManagerFactory() should run schema export if JPA properties are set 2013-04-02 14:55:19 -05:00
Steve Ebersole 84520cd6e3 HHH-7957 - Integrate Latest draft(s) of the JPA 2.1 spec 2013-04-02 14:46:08 -05:00
Strong Liu 3551bfa58f HHH-8127 OutOfMemoryError when running tests 2013-04-02 18:25:08 +08:00
Strong Liu 65f204fb72 HHH-8126 migrate HEM to metamodel branch 2013-04-02 14:16:49 +08:00
Brett Meyer 57001426bc Corrected compile error after master merge 2013-04-01 10:32:08 -04:00
Steve Ebersole 04a9701f8b HHH-7714 - Add support for EntityMode.MAP to JPA Criteria API 2013-04-01 08:23:41 -05:00
Strong Liu cb59c84389 merge master 2013-04-01 12:05:14 +08:00
Steve Ebersole c694c26c1d HHH-7957 - Integrate Latest draft(s) of the JPA 2.1 spec 2013-03-31 10:43:28 -05:00
Steve Ebersole bc85168015 HHH-8122 - Scrub known-sensitive settings from EMF.getProperties() 2013-03-29 12:43:17 -05:00
Brad Koehn f77b068e91 HHH-7714 Add support for EntityMode.MAP to JPA Criteria API
(cherry picked from commit 2758b8b494)

Conflicts:

	hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/predicate/InPredicate.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/MetadataContext.java
2013-03-29 12:10:31 -05:00
Brett Meyer e9e29a40be HHH-8096 Re-work the OSGi class loading concepts
Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
	hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java
	hibernate-osgi/src/main/java/org/hibernate/osgi/HibernateBundleActivator.java
2013-03-27 15:04:48 -04:00
Steve Ebersole 3bc89ad30f HHH-8099 - CDI 1.1 2013-03-25 15:48:29 -05:00
Strong Liu 72c5f8f5e9 merge master 2013-03-25 13:52:05 +08:00
Steve Ebersole d184cb3eb4 HHH-7462 - Make JACC service 2013-03-24 12:09:52 -05:00
Steve Ebersole e4c1db1e8f HHH-8088 - Redesign Scanner contract 2013-03-23 13:57:00 -05:00
Steve Ebersole eeca84460e HHH-8088 - Redesign Scanner contract 2013-03-21 18:17:11 -05:00