[238889] [Hibernate] Hide internal code

https://bugs.eclipse.org/bugs/show_bug.cgi?id=238889

3 files changed, 6 insertions, 8 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoHibernateMappingProvider.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoHibernateMappingProvider.java
index 8c8b2b70dd..981954e471 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoHibernateMappingProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoHibernateMappingProvider.java
@@ -14,6 +14,7 @@ package org.eclipse.emf.cdo.server.hibernate.teneo;
 import org.eclipse.emf.cdo.common.model.CDOPackage;
 import org.eclipse.emf.cdo.server.hibernate.IHibernateMappingProvider;
 import org.eclipse.emf.cdo.server.hibernate.IHibernateStore;
+import org.eclipse.emf.cdo.server.internal.hibernate.HibernateStore;
 import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil;
 import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
 
@@ -83,7 +84,7 @@ public class TeneoHibernateMappingProvider implements IHibernateMappingProvider
     rs.getPackageRegistry().put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE);
     rs.getPackageRegistry().put(XMLTypePackage.eNS_URI, XMLTypePackage.eINSTANCE);
     rs.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new EcoreResourceFactoryImpl());
-    for (CDOPackage cdoPackage : getHibernateStore().getPackageHandler().getCDOPackages())
+    for (CDOPackage cdoPackage : ((HibernateStore)hibernateStore).getPackageHandler().getCDOPackages())
     {
       if (TRACER.isEnabled())
       {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
index 948a0f8684..8a08f58778 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
@@ -13,10 +13,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server.hibernate.id;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Export-Package: org.eclipse.emf.cdo.server.hibernate;version="2.0.0",
- org.eclipse.emf.cdo.server.internal.hibernate;version="2.0.0",
- org.eclipse.emf.cdo.server.internal.hibernate.bundle;version="2.0.0",
- org.eclipse.emf.cdo.server.internal.hibernate.info;version="2.0.0",
- org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;version="2.0.0"
+ org.eclipse.emf.cdo.server.internal.hibernate;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests.hibernate",
+ org.eclipse.emf.cdo.server.internal.hibernate.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.server.internal.hibernate.info;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests.hibernate",
+ org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests.hibernate"
 Import-Package: org.hibernate;version="[3.2.0,4.0.0)",
  org.hibernate.cfg;version="[3.2.0,4.0.0)",
  org.hibernate.collection;version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java
index 3f270d650b..3f0766c8a7 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java
@@ -13,7 +13,6 @@ package org.eclipse.emf.cdo.server.hibernate;
 import org.eclipse.emf.cdo.server.ISession;
 import org.eclipse.emf.cdo.server.IStore;
 import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernatePackageHandler;
 
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
@@ -30,6 +29,4 @@ public interface IHibernateStore extends IStore
   public IHibernateStoreReader getReader(ISession session);
 
   public IHibernateStoreWriter getWriter(IView view);
-
-  public HibernatePackageHandler getPackageHandler();
 }