summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2008-05-28 16:50:21 (EDT)
committerMartin Taal2008-05-28 16:50:21 (EDT)
commitea4f6137e89b6955db3356891a102d8f0fbc8c97 (patch)
tree344b9f7cfd6cb9feb605aee5f9c9ea7ed7ea7fa1
parentb3308e0444a992bcfb99f5e2ed4e87223bcfd214 (diff)
downloadcdo-ea4f6137e89b6955db3356891a102d8f0fbc8c97.zip
cdo-ea4f6137e89b6955db3356891a102d8f0fbc8c97.tar.gz
cdo-ea4f6137e89b6955db3356891a102d8f0fbc8c97.tar.bz2
Removed dependency on cdo client
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoHibernateMappingProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java17
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 fa6c648..d7a3b95 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 940e556..efe73dd 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 49dd5cc..6e3e8b8 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;
+ // }
}
/**