Work for Teneo 2.0 Hibernate 4.1, removed EclipseLink

17 files changed, 10 insertions, 82 deletions

diff --git a/build/org.eclipse.emf.teneo.all-feature/feature.properties b/build/org.eclipse.emf.teneo.all-feature/feature.properties
index eec9595f1..8ecd5df6d 100755
--- a/build/org.eclipse.emf.teneo.all-feature/feature.properties
+++ b/build/org.eclipse.emf.teneo.all-feature/feature.properties
@@ -10,7 +10,7 @@
 #############################################################################
 
 # "featureName" property - name of the feature
-featureName=Teneo All-In-One Feature (Hibernate and EclipseLink)
+featureName=Teneo All-In-One Feature (Hibernate)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse Modeling Project
diff --git a/build/org.eclipse.emf.teneo.all-feature/feature.xml b/build/org.eclipse.emf.teneo.all-feature/feature.xml
index 444bb99c4..0f7ad9675 100755
--- a/build/org.eclipse.emf.teneo.all-feature/feature.xml
+++ b/build/org.eclipse.emf.teneo.all-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.teneo.all"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description url=" http://www.eclipse.org/emf">
@@ -34,12 +34,4 @@ http://www.eclipse.org/legal/epl-v10.html
          id="org.eclipse.emf.teneo.examples"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.emf.teneo.eclipselink.sdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.teneo.eclipselink.examples"
-         version="0.0.0"/>
-
 </feature>
diff --git a/build/org.eclipse.emf.teneo.cdo-feature/feature.xml b/build/org.eclipse.emf.teneo.cdo-feature/feature.xml
index cf928fefd..52422b1a3 100755
--- a/build/org.eclipse.emf.teneo.cdo-feature/feature.xml
+++ b/build/org.eclipse.emf.teneo.cdo-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.teneo.cdo"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description url=" http://www.eclipse.org/emf">
diff --git a/build/org.eclipse.emf.teneo.cdo.sdk-feature/feature.xml b/build/org.eclipse.emf.teneo.cdo.sdk-feature/feature.xml
index f93599c74..8198aeca4 100755
--- a/build/org.eclipse.emf.teneo.cdo.sdk-feature/feature.xml
+++ b/build/org.eclipse.emf.teneo.cdo.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.teneo.cdo.sdk"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description url=" http://www.eclipse.org/emf">
diff --git a/build/org.eclipse.emf.teneo.hibernate-feature/feature.xml b/build/org.eclipse.emf.teneo.hibernate-feature/feature.xml
index 68b5ba7c4..45ce0f764 100755
--- a/build/org.eclipse.emf.teneo.hibernate-feature/feature.xml
+++ b/build/org.eclipse.emf.teneo.hibernate-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.teneo.hibernate"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description url=" http://www.eclipse.org/emf">
diff --git a/build/org.eclipse.emf.teneo.hibernate.sdk-feature/feature.xml b/build/org.eclipse.emf.teneo.hibernate.sdk-feature/feature.xml
index d8541aabe..aaafbec3a 100755
--- a/build/org.eclipse.emf.teneo.hibernate.sdk-feature/feature.xml
+++ b/build/org.eclipse.emf.teneo.hibernate.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.teneo.hibernate.sdk"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description url=" http://www.eclipse.org/emf">
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties b/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
index 0af059fba..2848e07af 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
@@ -35,5 +35,5 @@ signing.type=eclipse.local
 teneo.download.area=/home/data/httpd/download.eclipse.org/modeling/emf/teneo
 buckminster.p2.site=http://download.eclipse.org/tools/buckminster/headless-3.6
 director.url=http://download.eclipse.org/tools/buckminster/products/director_latest.zip
-thirdparty.url=http://www.elver.org/eclipse/update/teneotexodeps.zip
+thirdparty.url=http://www.elver.org/eclipse/2.0.0/update/teneotexodeps.zip
 #eclipse.staging.area=${env.HUDSON_HOME}/jobs/${env.JOB_NAME}/signing
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build.xml b/build/org.eclipse.emf.teneo.releng.buckminster/build.xml
index d9b7ba3b2..22d88e0a7 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/build.xml
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/build.xml
@@ -52,7 +52,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
 		<isset property="env.BUILDTYPE" />
 	</condition>
 
-	<condition property="teneo.version" value="${env.VERSION}" else="1.2.0">
+	<condition property="teneo.version" value="${env.VERSION}" else="2.0.0">
 		<isset property="env.VERSION" />
 	</condition>
 
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap b/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap
index 47c1d7d76..9b5da9dea 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap
@@ -29,12 +29,6 @@
 			</uri>
 		</provider>
 		<provider componentTypes="osgi.bundle" readerType="git" source="true">
-			<uri format="{0},eclipselink/{1}">
-				<bc:propertyRef key="gitPath"/>
-				<bc:propertyRef key="buckminster.component"/>
-			</uri>
-		</provider>
-		<provider componentTypes="osgi.bundle" readerType="git" source="true">
 			<uri format="{0},hibernate/{1}">
 				<bc:propertyRef key="gitPath"/>
 				<bc:propertyRef key="buckminster.component"/>
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo_build.xml b/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo_build.xml
index 2df630765..8f63c340e 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo_build.xml
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo_build.xml
@@ -84,7 +84,6 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
 			</globargs>
 			<cmdargs>
 				<arg value="org.eclipse.emf.teneo.hibernate:eclipse.feature#site.p2" />
-				<arg value="org.eclipse.emf.teneo.eclipselink:eclipse.feature#site.p2" />
 			</cmdargs>
 		</buckminster>
 		
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl b/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl
index 177e80202..5fe86a07d 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl
@@ -29,7 +29,7 @@
 					<br />
 					Some EMF Teneo plugins require third party drivers from the
 					following update site:
-					<a href="http://www.elver.org/eclipse/update/">Teneo/Texo dependencies</a>
+					<a href="http://www.elver.org/eclipse/2.0.0/update/">Teneo/Texo dependencies</a>
 					.
 					<br />
 					<br />
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap b/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap
index 4d5ab6359..708a0776c 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap
@@ -37,12 +37,6 @@
 			</uri>
 		</provider>
 		<provider componentTypes="osgi.bundle" readerType="git" source="true">
-			<uri format="{0},eclipselink/{1}">
-				<bc:propertyRef key="gitPath"/>
-				<bc:propertyRef key="buckminster.component"/>
-			</uri>
-		</provider>
-		<provider componentTypes="osgi.bundle" readerType="git" source="true">
 			<uri format="{0},hibernate/{1}">
 				<bc:propertyRef key="gitPath"/>
 				<bc:propertyRef key="buckminster.component"/>
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo_test.xml b/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo_test.xml
index 157791d14..fe9738621 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo_test.xml
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo_test.xml
@@ -95,28 +95,6 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
 			<param name="testPackage" expression="org.eclipse.emf.teneo.hibernate.tests" />
 		</xslt-->
 
-		<echo message="Running tests EclipseLink" />
-		<buckminster command="junit" workspace="${workspacePath}">
-			<cmdargs>
-				<arg value="-l" />
-				<arg value="org.eclipse.emf.teneo.eclipselink.examples.library.orm.tests/AllTests.launch" />
-				<arg value="-o" />
-				<arg value="${testResultsPath}/output/test-results-eclipselink.xml" />
-				<arg value="--stdout" />
-				<arg value="${testResultsPath}/output/stdout.txt" />
-				<arg value="--stderr" />
-				<arg value="${testResultsPath}/output/stderr.txt" />
-				<arg value="--flatXML"/>
-			</cmdargs>
-		</buckminster>
-
-		<!-- convert the xml to a format which can be read by junit report>
-		NOTE: not used anymore, the flatXML argument now takes care of this
-		<xslt in="${testResultsPath}/output/test-results-eclipselink.xml" out="${testResultsPath}/xml/TESTS-eclipselink.xml" style="convert-test-results.xsl">
-			<param name="timeStamp" expression="${buildTimeStamp}" />
-			<param name="testName" expression="EclipseLink Tests" />
-			<param name="testPackage" expression="org.eclipse.emf.teneo.eclipselink.tests" />
-		</xslt-->
 	</target>
 
 	<target name="init.build.properties">
diff --git a/build/org.eclipse.emf.teneo.site-feature/category.xml b/build/org.eclipse.emf.teneo.site-feature/category.xml
index 9f6741bf0..86d53d310 100755
--- a/build/org.eclipse.emf.teneo.site-feature/category.xml
+++ b/build/org.eclipse.emf.teneo.site-feature/category.xml
@@ -6,12 +6,6 @@
    <feature id="org.eclipse.emf.teneo.hibernate.sdk" version="0.0.0">
       <category name="org.eclipse.emf.teneo.hibernate"/>
    </feature>
-   <feature id="org.eclipse.emf.teneo.eclipselink" version="0.0.0">
-      <category name="org.eclipse.emf.teneo.eclipselink"/>
-   </feature>
-   <feature id="org.eclipse.emf.teneo.eclipselink.sdk" version="0.0.0">
-      <category name="org.eclipse.emf.teneo.eclipselink"/>
-   </feature>
    <feature id="org.eclipse.emf.teneo.cdo" version="0.0.0">
       <category name="org.eclipse.emf.teneo.cdo"/>
    </feature>
@@ -19,6 +13,5 @@
       <category name="org.eclipse.emf.teneo.cdo"/>
    </feature>
    <category-def name="org.eclipse.emf.teneo.hibernate" label="EMF Teneo - Hibernate"/>
-   <category-def name="org.eclipse.emf.teneo.eclipselink" label="EMF Teneo - EclipseLink"/>
    <category-def name="org.eclipse.emf.teneo.cdo" label="EMF Teneo - CDO Hibernate Store"/>
 </site>
diff --git a/build/org.eclipse.emf.teneo.site-feature/feature.properties b/build/org.eclipse.emf.teneo.site-feature/feature.properties
index cfba028bd..c9f85db85 100755
--- a/build/org.eclipse.emf.teneo.site-feature/feature.properties
+++ b/build/org.eclipse.emf.teneo.site-feature/feature.properties
@@ -18,7 +18,7 @@
 
 providerName = Eclipse Modeling Project
 featureName = EMF Teneo All
-description = EMF Teneo All contains the EMF Hibernate and EclipseLink integrations.
+description = EMF Teneo All contains EMF Hibernate integration.
 
 copyrightURL = copyright.txt
 copyright = Copyright (c) 2010 Martin Taal (Doorn, The Netherlands) and others.\n\
diff --git a/build/org.eclipse.emf.teneo.site-feature/feature.xml b/build/org.eclipse.emf.teneo.site-feature/feature.xml
index 13503faca..409e0a751 100755
--- a/build/org.eclipse.emf.teneo.site-feature/feature.xml
+++ b/build/org.eclipse.emf.teneo.site-feature/feature.xml
@@ -24,14 +24,6 @@
    </url>
 
    <includes
-         id="org.eclipse.emf.teneo.eclipselink"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.teneo.eclipselink.sdk"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.emf.teneo.hibernate"
          version="0.0.0"/>
 
diff --git a/build/org.eclipse.emf.teneo.tests-feature/feature.xml b/build/org.eclipse.emf.teneo.tests-feature/feature.xml
index 496e4101a..45a91c80d 100755
--- a/build/org.eclipse.emf.teneo.tests-feature/feature.xml
+++ b/build/org.eclipse.emf.teneo.tests-feature/feature.xml
@@ -32,20 +32,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.emf.teneo.eclipselink.examples.library"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.teneo.eclipselink.examples.library.orm.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.emf.teneo.hibernate.test"
          download-size="0"
          install-size="0"