Fix version problems

16 files changed, 125 insertions, 6 deletions

diff --git a/features/org.eclipse.emf.cdo.server.db-feature/feature.properties b/features/org.eclipse.emf.cdo.server.db-feature/feature.properties
index 408de38340..e91ae39c54 100644
--- a/features/org.eclipse.emf.cdo.server.db-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server.db-feature/feature.properties
@@ -4,5 +4,5 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 
-featureName = CDO Model Repository Server JDBC Support
+featureName = CDO Model Repository Server DB Store
 description = Contains the DBStore plugins.
diff --git a/features/org.eclipse.emf.cdo.server.db4o-feature/feature.properties b/features/org.eclipse.emf.cdo.server.db4o-feature/feature.properties
index 0d2d357fbf..5e22cb48af 100644
--- a/features/org.eclipse.emf.cdo.server.db4o-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server.db4o-feature/feature.properties
@@ -4,5 +4,5 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 
-featureName = CDO Model Repository Server DB4O Support
+featureName = CDO Model Repository Server DB4O Store
 description = Contains the DB4O Store bundle. Ensure that DB4O Driver is already installed! Visit http://net4j.sourceforge.net/update for a p2 repository that contains DB4O Driver.
diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties
index 1af204229a..7dc6db596a 100644
--- a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.properties
@@ -4,5 +4,5 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 
-featureName = CDO Model Repository Server Hibernate Support
+featureName = CDO Model Repository Server Hibernate Store
 description = Contains the HibernateStore and Teneo integration plugins. Ensure that Hibernate is already installed! Visit http://www.elver.org/eclipse/2.0.0/update for a p2 repository that contains Hibernate.
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/.project b/features/org.eclipse.emf.cdo.server.lissome-feature/.project
new file mode 100644
index 0000000000..9cd641a418
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.cdo.server.lissome-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.emf.cdo.releng/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+		<nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..a0535be04b
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Mon Jul 04 12:35:39 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644
index 0000000000..d573634502
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
@@ -0,0 +1,4 @@
+#Thu Feb 04 10:06:10 CET 2010
+eclipse.preferences.version=1
+project.repository.kind=bugzilla
+project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.mylyn.team.ui.prefs
new file mode 100644
index 0000000000..4d86eb45ba
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/.settings/org.eclipse.mylyn.team.ui.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 10:06:10 CET 2010
+commit.comment.template=[${task.id}] ${task.description} \r\n${task.url}
+eclipse.preferences.version=1
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/build.properties b/features/org.eclipse.emf.cdo.server.lissome-feature/build.properties
new file mode 100644
index 0000000000..702432df1e
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/build.properties
@@ -0,0 +1,13 @@
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
+
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/feature.properties b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.properties
new file mode 100644
index 0000000000..521936b672
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.properties
@@ -0,0 +1,8 @@
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+
+featureName = CDO Model Repository Server Lissome Store
+description = Contains the MongoDBStore plugins. Ensure that a MongoDB Java driver is already installed! Visit http://net4j.sourceforge.net/update for a p2 repository that contains a MongoDB Java driver.
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
new file mode 100644
index 0000000000..e887fd35fe
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+	All rights reserved. This program and the accompanying materials
+	are made available under the terms of the Eclipse Public License v1.0
+	which accompanies this distribution, and is available at
+	http://www.eclipse.org/legal/epl-v10.html
+
+	Contributors:
+	  Eike Stepper - initial API and implementation
+-->
+<feature
+      id="org.eclipse.emf.cdo.server.lissome"
+      label="%featureName"
+      version="4.2.0.qualifier"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.emf.cdo.license"
+      license-feature-version="4.1.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="%copyrightURL">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+      <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.emf.cdo.server.lissome"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties
index bebdba340f..e302db6601 100644
--- a/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server.mongodb-feature/feature.properties
@@ -4,5 +4,5 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 
-featureName = CDO Model Repository Server MongoDB Support
+featureName = CDO Model Repository Server MongoDB Store
 description = Contains the MongoDBStore plugins. Ensure that a MongoDB Java driver is already installed! Visit http://net4j.sourceforge.net/update for a p2 repository that contains a MongoDB Java driver.
diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.properties b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.properties
index 5e08d272c9..5b02c2e669 100644
--- a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.properties
@@ -4,5 +4,5 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 
-featureName = CDO Model Repository Server Objectivity Support
+featureName = CDO Model Repository Server Objectivity Store
 description = Contains the Objectivity Store and stubbed jar file bundle. For runtime, ensure that you have Objectivity /DB installed!
diff --git a/features/org.eclipse.emf.cdo.site-feature/category.xml b/features/org.eclipse.emf.cdo.site-feature/category.xml
index 8944e8ce28..a9f1b4de06 100644
--- a/features/org.eclipse.emf.cdo.site-feature/category.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/category.xml
@@ -21,6 +21,9 @@
    <feature id="org.eclipse.emf.cdo.server" version="0.0.0">
       <category name="org.eclipse.emf.cdo.category"/>
    </feature>
+   <feature id="org.eclipse.emf.cdo.server.lissome" version="0.0.0">
+      <category name="org.eclipse.emf.cdo.category"/>
+   </feature>
    <feature id="org.eclipse.emf.cdo.server.db" version="0.0.0">
       <category name="org.eclipse.emf.cdo.category"/>
    </feature>
diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml
index 834dcce667..6c91e7958b 100644
--- a/features/org.eclipse.emf.cdo.site-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml
@@ -95,6 +95,10 @@
          version="0.0.0"/>
 
    <includes
+         id="org.eclipse.emf.cdo.server.lissome"
+         version="0.0.0"/>
+
+   <includes
          id="org.eclipse.emf.cdo.tests"
          version="0.0.0"/>
 
diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
index 93acb80ebb..9fb039f87f 100644
--- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml
@@ -42,7 +42,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/> <!-- Used to be true -->
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.cdo.tests.db"
@@ -52,6 +52,13 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.emf.cdo.tests.lissome"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.emf.cdo.tests.mongodb"
          download-size="0"
          install-size="0"
diff --git a/features/org.eclipse.net4j.db.db2-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.net4j.db.db2-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..b9743bf086
--- /dev/null
+++ b/features/org.eclipse.net4j.db.db2-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/.project=UTF-8