Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8378 Cleanup during Bundle#stop. Added shutdown unit test. 

Conflicts:
	hibernate-osgi/src/main/java/org/hibernate/osgi/HibernateBundleActivator.java
	hibernate-osgi/src/test/java/org/hibernate/osgi/test/OsgiTestCase.java
This commit is contained in:
Brett Meyer 2013-07-24 11:47:55 -04:00
parent 2cd2c3955f
commit acafe63ead
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hibernate-osgi/src/main/java/org/hibernate/osgi/HibernateBundleActivator.java
View File

@ -35,6 +35,7 @@ import org.hibernate.internal.util.ClassLoaderHelper;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceRegistration;
/**
* This BundleActivator provides three different uses of Hibernate in OSGi
@ -58,34 +59,38 @@ import org.osgi.framework.FrameworkUtil;
* @author Tim Ward
*/
public class HibernateBundleActivator implements BundleActivator {
private OsgiClassLoader osgiClassLoader;
private OsgiJtaPlatform osgiJtaPlatform;
private ServiceRegistration<?> persistenceProviderService;
private ServiceRegistration<?> sessionFactoryService;
@Override
public void start(BundleContext context) throws Exception {
osgiClassLoader = new OsgiClassLoader();
OsgiClassLoader osgiClassLoader = new OsgiClassLoader();
osgiClassLoader.addBundle( FrameworkUtil.getBundle( Session.class ) );
osgiClassLoader.addBundle( FrameworkUtil.getBundle( HibernatePersistence.class ) );
ClassLoaderHelper.overridenClassLoader = osgiClassLoader;
osgiJtaPlatform = new OsgiJtaPlatform( context );
OsgiJtaPlatform osgiJtaPlatform = new OsgiJtaPlatform( context );
Dictionary properties = new Hashtable();
// In order to support existing persistence.xml files, register
// using the legacy provider name.
properties.put( "javax.persistence.provider", HibernatePersistence.class.getName() );
context.registerService( PersistenceProvider.class.getName(),
persistenceProviderService = context.registerService( PersistenceProvider.class.getName(),
new OsgiPersistenceProviderService( osgiClassLoader, osgiJtaPlatform, context ), properties );
context.registerService( SessionFactory.class.getName(),
sessionFactoryService = context.registerService( SessionFactory.class.getName(),
new OsgiSessionFactoryService( osgiClassLoader, osgiJtaPlatform, context ), new Hashtable());
}
@Override
public void stop(BundleContext context) throws Exception {
// Nothing else to do?
persistenceProviderService.unregister();
persistenceProviderService = null;
sessionFactoryService.unregister();
sessionFactoryService = null;
ClassLoaderHelper.overridenClassLoader = null;
}
}