Removed dependency on cdo client

3 files changed, 9 insertions, 11 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 fa6c648925..d7a3b9523c 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
@@ -105,7 +105,7 @@ public class TeneoHibernateMappingProvider implements IHibernateMappingProvider
 
     // translate the list of EPackages to an array
     final EPackage[] ePackageArray = epacks.toArray(new EPackage[epacks.size()]);
-
+    properties.put("teneo.mapping.also_map_as_class", "false");
     return CDOHelper.getInstance().generateMapping(ePackageArray, properties);
   }
 
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 940e556a80..efe73dd39a 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
@@ -10,7 +10,6 @@ Bundle-Activator: org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM$Activa
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server.hibernate.libraries;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server.hibernate.id;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
index 49dd5cc7d9..6e3e8b847f 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
@@ -10,7 +10,6 @@
  **************************************************************************/
 package org.eclipse.emf.cdo.server.internal.hibernate;
 
-import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.internal.protocol.id.CDOIDNullImpl;
 import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
 import org.eclipse.emf.cdo.protocol.id.CDOID;
@@ -93,14 +92,14 @@ public class HibernateUtil
 
   public InternalCDORevision getCDORevision(Object target)
   {
-    if (target instanceof CDOObject)
-    {
-      return (InternalCDORevision)((CDOObject)target).cdoRevision();
-    }
-    else
-    {
-      return (InternalCDORevision)target;
-    }
+    // if (target instanceof CDOObject)
+    // {
+    // return (InternalCDORevision)((CDOObject)target).cdoRevision();
+    // }
+    // else
+    // {
+    return (InternalCDORevision)target;
+    // }
   }
 
   /**