HHH-10044 automatically add hibernate-core and hibernate-entitymanage…

…r Bundles to OsgiClassLoader
hibernate · Aug 25, 2015 · 53e81a2 · 53e81a2
1 parent 45cea33
commit 53e81a2
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiPersistenceProviderService.java b/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiPersistenceProviderService.java
@@ -6,7 +6,10 @@
  */
 package org.hibernate.osgi;
 
+import org.hibernate.SessionFactory;
+import org.hibernate.jpa.HibernateEntityManagerFactory;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceFactory;
 import org.osgi.framework.ServiceRegistration;
 
@@ -36,8 +39,15 @@ public OsgiPersistenceProviderService(
 	@Override
 	public Object getService(Bundle requestingBundle, ServiceRegistration registration) {
 		final OsgiClassLoader osgiClassLoader = new OsgiClassLoader();
+
+        // First, add the client bundle that's requesting the OSGi services.
 		osgiClassLoader.addBundle( requestingBundle );
 
+        // Then, automatically add hibernate-core and hibernate-entitymanager.  These are needed to load resources
+        // contained in those jars, such as em's persistence.xml schemas.
+        osgiClassLoader.addBundle( FrameworkUtil.getBundle( SessionFactory.class ) );
+        osgiClassLoader.addBundle( FrameworkUtil.getBundle( HibernateEntityManagerFactory.class ) );
+
 		// Some "boot time" code does still rely on TCCL.  "run time" code should all be using
 		// ClassLoaderService now.