[227883] Integrate Hibernate/Teneo into CDO build

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

2 files changed, 27 insertions, 4 deletions

diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
index 877b8ed0f6..1bc55ac260 100644
--- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml
@@ -35,10 +35,6 @@
       <update label="%updateSiteName" url="http://download.eclipse.org/modeling/emft/updates/"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
-   </requires>
-
    <includes
          id="org.eclipse.emf.cdo"
          version="0.0.0"/>
@@ -67,6 +63,19 @@
          id="org.eclipse.emf.cdo.doc"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.emf.cdo.server.hibernate"
+         version="0.0.0"
+         optional="true"/>
+
+   <includes
+         id="org.eclipse.emf.cdo.server.hibernate.source"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
+   </requires>
+
    <plugin
          id="org.eclipse.emf.cdo.migrator"
          download-size="0"
diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
index 25e854de46..64dcebd084 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
@@ -107,4 +107,18 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="org.eclipse.emf.cdo.tests.hibernate"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.emf.cdo.tests.hibernate.client"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>