From 697aa7bbc5de256eeddcef0d9f1554fecd7210ad Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Mon, 2 Jun 2008 02:46:17 +0000
Subject: [227883]  Integrate Hibernate/Teneo into CDO build
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=227883

---
 .../internal/hibernate/HibernatePackageHandler.java | 21 ++++++++-------------
 .../server/internal/hibernate/HibernateStore.java   | 18 ++----------------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
index f275e8d668..efbe56b378 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
@@ -47,7 +47,7 @@ import java.util.List;
  * @author Eike Stepper
  * @author Martin Taal
  */
-public class HibernatePackageHandler
+public class HibernatePackageHandler extends Lifecycle
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HibernateStoreWriter.class);
 
@@ -358,36 +358,31 @@ public class HibernatePackageHandler
     cdoPackageInfos = null;
   }
 
-  protected void doActivate()
+  @Override
+  protected void doActivate() throws Exception
   {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Activating CDOPackageHandler");
-    }
-
+    super.doActivate();
     initConfiguration();
     initSchema();
   }
 
+  @Override
   protected void doDeactivate() throws Exception
   {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Deactivating CDOPackageHandler");
-    }
-
     if (sessionFactory != null)
     {
       sessionFactory.close();
       sessionFactory = null;
     }
+
+    super.doDeactivate();
   }
 
   protected void initConfiguration()
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace("Initializing datastore for CDO metadata");
+      TRACER.trace("Initializing configuration for CDO metadata");
     }
 
     InputStream in = null;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
index 18ed9693ec..5b242ae55b 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
@@ -193,25 +193,13 @@ public class HibernateStore extends Store implements IHibernateStore
   @Override
   protected void doActivate() throws Exception
   {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Activating HibernateStore");
-    }
-
     super.doActivate();
-
-    // Activate the package store
-    packageHandler.doActivate();
+    packageHandler.activate();
   }
 
   @Override
   protected void doDeactivate() throws Exception
   {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("De-Activating HibernateStore");
-    }
-
     if (hibernateSessionFactory != null)
     {
       if (TRACER.isEnabled())
@@ -223,8 +211,7 @@ public class HibernateStore extends Store implements IHibernateStore
       hibernateSessionFactory = null;
     }
 
-    packageHandler.doDeactivate();
-
+    packageHandler.deactivate();
     super.doDeactivate();
   }
 
@@ -267,7 +254,6 @@ public class HibernateStore extends Store implements IHibernateStore
     try
     {
       hibernateConfiguration = new Configuration();
-
       if (mappingProvider != null)
       {
         mappingProvider.setHibernateStore(this);
-- 
cgit v1.2.3