diff options
author | Eike Stepper | 2012-08-31 17:56:48 +0000 |
---|---|---|
committer | Eike Stepper | 2012-08-31 17:56:48 +0000 |
commit | 451f3f409934e97d4b3ad5c7b34adc7def90b380 (patch) | |
tree | e9a678b0a4b3ef08e4189a7a460616c24080d36f | |
parent | c141640f3f3eb3ab20c7fbf541cd6e002e4b1951 (diff) | |
download | cdo-451f3f409934e97d4b3ad5c7b34adc7def90b380.tar.gz cdo-451f3f409934e97d4b3ad5c7b34adc7def90b380.tar.xz cdo-451f3f409934e97d4b3ad5c7b34adc7def90b380.zip |
Fix version problems
70 files changed, 346 insertions, 106 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 diff --git a/plugins/org.eclipse.emf.cdo.edit/.project b/plugins/org.eclipse.emf.cdo.edit/.project index 95b85d5ce5..241f4620e2 100644 --- a/plugins/org.eclipse.emf.cdo.edit/.project +++ b/plugins/org.eclipse.emf.cdo.edit/.project @@ -24,10 +24,6 @@ <name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name> <arguments> <dictionary> - <key>ignore.missing.export.versions</key> - <value>true</value> - </dictionary> - <dictionary> <key>release.path</key> <value>/org.eclipse.emf.cdo.releng/release.xml</value> </dictionary> diff --git a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.core.resources.prefs index fab51d3bb3..f06cc0ffca 100644 --- a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 12:54:50 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.project b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.project index ead4d3ad8f..c64417bc04 100644 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.project +++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..b9743bf086 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/.project=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF index f8162a95cd..da39f548d0 100644 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.examples.hibernate.client -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -33,4 +33,4 @@ Import-Package: org.hibernate;version="[4.0.0,5.0.0)", org.hibernate.type;version="[4.0.0,5.0.0)", org.hibernate.usertype;version="[4.0.0,5.0.0)", org.apache.commons.logging;version="[1.0.0,2.0.0)" -Export-Package: org.eclipse.emf.cdo.examples.hibernate.client;version="4.1.0" +Export-Package: org.eclipse.emf.cdo.examples.hibernate.client;version="4.1.100" diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/.project b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/.project index 3f4ed76215..4b80ae5374 100644 --- a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/.project +++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.project b/plugins/org.eclipse.emf.cdo.examples.installer.client/.project index 8283637aa9..241694e848 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.project +++ b/plugins/org.eclipse.emf.cdo.examples.installer.client/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer.client/META-INF/MANIFEST.MF index 077be73f09..e9e7007dbf 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer.client/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.installer.client;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.project b/plugins/org.eclipse.emf.cdo.examples.installer.clone/.project index bea090269a..b770c93930 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.project +++ b/plugins/org.eclipse.emf.cdo.examples.installer.clone/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.project b/plugins/org.eclipse.emf.cdo.examples.installer.master/.project index e7210f48ab..e10c0c1260 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.project +++ b/plugins/org.eclipse.emf.cdo.examples.installer.master/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer.master/META-INF/MANIFEST.MF index 9550049bcb..82f5abcb99 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer.master/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.installer.master;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/.project b/plugins/org.eclipse.emf.cdo.examples.installer/.project index 510e13b590..49196e5a76 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/.project +++ b/plugins/org.eclipse.emf.cdo.examples.installer/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF index eb38f7c061..57aba02266 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.installer;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.releng.buildstamp/.project b/plugins/org.eclipse.emf.cdo.releng.buildstamp/.project index 8cdc53ec4b..6023858cd9 100644 --- a/plugins/org.eclipse.emf.cdo.releng.buildstamp/.project +++ b/plugins/org.eclipse.emf.cdo.releng.buildstamp/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.gitbash/.project b/plugins/org.eclipse.emf.cdo.releng.gitbash/.project index 82a002898b..e6014a8cdb 100644 --- a/plugins/org.eclipse.emf.cdo.releng.gitbash/.project +++ b/plugins/org.eclipse.emf.cdo.releng.gitbash/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.help/.project b/plugins/org.eclipse.emf.cdo.releng.help/.project index b62cfd13d6..04c27c8c74 100644 --- a/plugins/org.eclipse.emf.cdo.releng.help/.project +++ b/plugins/org.eclipse.emf.cdo.releng.help/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.help/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.releng.help/.settings/org.eclipse.core.resources.prefs index 64c60c3db1..5f902d4729 100644 --- a/plugins/org.eclipse.emf.cdo.releng.help/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.releng.help/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,5 @@ -#Mon Jul 04 13:04:43 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/eresource.ecorediag=UTF-8 encoding//model/etypes.ecore=UTF-8 encoding//model/etypes.ecorediag=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF index 1d61c13f16..db358889eb 100644 --- a/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF @@ -2,24 +2,24 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.releng.help; singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=optional, org.eclipse.emf.cdo.doc;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport -Export-Package: org.eclipse.emf.cdo.releng.help;version="4.1.0", - org.eclipse.emf.cdo.releng.help.contributor;version="4.1.0", - org.eclipse.emf.cdo.releng.help.online;version="4.1.0", - org.eclipse.emf.cdo.releng.help.reference;version="4.1.0", - org.eclipse.emf.cdo.releng.help.reference.api;version="4.1.0", - org.eclipse.emf.cdo.releng.help.releng;version="4.1.0", - org.eclipse.emf.cdo.releng.help.releng.building;version="4.1.0", - org.eclipse.emf.cdo.releng.help.releng.promoting;version="4.1.0", - org.eclipse.emf.cdo.releng.help.releng.provisioning;version="4.1.0", - org.eclipse.emf.cdo.releng.help.releng.versioning;version="4.1.0", - org.eclipse.emf.cdo.releng.help.writer;version="4.1.0", - org.eclipse.emf.cdo.releng.help.writer.authoring;version="4.1.0", - org.eclipse.emf.cdo.releng.help.writer.building;version="4.1.0", - org.eclipse.emf.cdo.releng.help.writer.examples;version="4.1.0" +Export-Package: org.eclipse.emf.cdo.releng.help;version="4.1.100", + org.eclipse.emf.cdo.releng.help.contributor;version="4.1.100", + org.eclipse.emf.cdo.releng.help.online;version="4.1.100", + org.eclipse.emf.cdo.releng.help.reference;version="4.1.100", + org.eclipse.emf.cdo.releng.help.reference.api;version="4.1.100", + org.eclipse.emf.cdo.releng.help.releng;version="4.1.100", + org.eclipse.emf.cdo.releng.help.releng.building;version="4.1.100", + org.eclipse.emf.cdo.releng.help.releng.promoting;version="4.1.100", + org.eclipse.emf.cdo.releng.help.releng.provisioning;version="4.1.100", + org.eclipse.emf.cdo.releng.help.releng.versioning;version="4.1.100", + org.eclipse.emf.cdo.releng.help.writer;version="4.1.100", + org.eclipse.emf.cdo.releng.help.writer.authoring;version="4.1.100", + org.eclipse.emf.cdo.releng.help.writer.building;version="4.1.100", + org.eclipse.emf.cdo.releng.help.writer.examples;version="4.1.100" diff --git a/plugins/org.eclipse.emf.cdo.releng.launches/.project b/plugins/org.eclipse.emf.cdo.releng.launches/.project index e81b24e60e..b7c47b8c53 100644 --- a/plugins/org.eclipse.emf.cdo.releng.launches/.project +++ b/plugins/org.eclipse.emf.cdo.releng.launches/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.manifests/.project b/plugins/org.eclipse.emf.cdo.releng.manifests/.project index ebc99848d6..9011271c76 100644 --- a/plugins/org.eclipse.emf.cdo.releng.manifests/.project +++ b/plugins/org.eclipse.emf.cdo.releng.manifests/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.projectcopy/.project b/plugins/org.eclipse.emf.cdo.releng.projectcopy/.project index 285955429b..415f1b1e38 100644 --- a/plugins/org.eclipse.emf.cdo.releng.projectcopy/.project +++ b/plugins/org.eclipse.emf.cdo.releng.projectcopy/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.relativepaths/.project b/plugins/org.eclipse.emf.cdo.releng.relativepaths/.project index 302586ee92..a6fe1e82c9 100644 --- a/plugins/org.eclipse.emf.cdo.releng.relativepaths/.project +++ b/plugins/org.eclipse.emf.cdo.releng.relativepaths/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.relativepaths/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.releng.relativepaths/.settings/org.eclipse.core.resources.prefs index b02ec790ac..f06cc0ffca 100644 --- a/plugins/org.eclipse.emf.cdo.releng.relativepaths/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.releng.relativepaths/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 11 16:02:45 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF index c2f2e03650..590a3eca6e 100644 --- a/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.releng.relativepaths;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.releng.relativepaths;version="1.0.0";x-internal:=true +Export-Package: org.eclipse.emf.cdo.releng.relativepaths;version="1.0.100";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.releng.tasks/.project b/plugins/org.eclipse.emf.cdo.releng.tasks/.project index c486fb1243..cad726d707 100644 --- a/plugins/org.eclipse.emf.cdo.releng.tasks/.project +++ b/plugins/org.eclipse.emf.cdo.releng.tasks/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.version.digest/.project b/plugins/org.eclipse.emf.cdo.releng.version.digest/.project index ac6e23e5d1..0e0685af41 100644 --- a/plugins/org.eclipse.emf.cdo.releng.version.digest/.project +++ b/plugins/org.eclipse.emf.cdo.releng.version.digest/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.version.ui/.project b/plugins/org.eclipse.emf.cdo.releng.version.ui/.project index 96e23c7e08..7dc77e48fa 100644 --- a/plugins/org.eclipse.emf.cdo.releng.version.ui/.project +++ b/plugins/org.eclipse.emf.cdo.releng.version.ui/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.version/.project b/plugins/org.eclipse.emf.cdo.releng.version/.project index 29fdf3ef01..8660f179b1 100644 --- a/plugins/org.eclipse.emf.cdo.releng.version/.project +++ b/plugins/org.eclipse.emf.cdo.releng.version/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.windowtitle/.project b/plugins/org.eclipse.emf.cdo.releng.windowtitle/.project index 4ca69d4a7d..b71ebeef88 100644 --- a/plugins/org.eclipse.emf.cdo.releng.windowtitle/.project +++ b/plugins/org.eclipse.emf.cdo.releng.windowtitle/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.winexplorer/.project b/plugins/org.eclipse.emf.cdo.releng.winexplorer/.project index ece32abc29..a3cb5e3fac 100644 --- a/plugins/org.eclipse.emf.cdo.releng.winexplorer/.project +++ b/plugins/org.eclipse.emf.cdo.releng.winexplorer/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/.project b/plugins/org.eclipse.emf.cdo.releng.workingsets/.project index 17a90abce8..b1137695bd 100644 --- a/plugins/org.eclipse.emf.cdo.releng.workingsets/.project +++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.releng/release.properties b/plugins/org.eclipse.emf.cdo.releng/release.properties index 1b0ccd7623..640cff2ceb 100644 --- a/plugins/org.eclipse.emf.cdo.releng/release.properties +++ b/plugins/org.eclipse.emf.cdo.releng/release.properties @@ -1,2 +1,5 @@ -baseline.for.integration = true -show.deviations = false +# +#Fri Aug 31 19:41:35 CEST 2012 +baseline.for.integration=true +root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.net4j.db.db2 +show.deviations=false diff --git a/plugins/org.eclipse.emf.cdo.server.db/about.properties b/plugins/org.eclipse.emf.cdo.server.db/about.properties index 60839423b6..527e954833 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.db/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server JDBC Support -featureText = CDO Model Repository Server JDBC Support\n\ +featureName = CDO Model Repository Server DB Store +featureText = CDO Model Repository Server DB Store\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.db/plugin.properties b/plugins/org.eclipse.emf.cdo.server.db/plugin.properties index 9d8296309f..783a07b724 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.db/plugin.properties @@ -7,7 +7,7 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server JDBC Support +pluginName = CDO Model Repository Server DB Store providerName = Eclipse Modeling Project extension-point.name = CDO Mapping Strategies
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/about.properties b/plugins/org.eclipse.emf.cdo.server.db4o/about.properties index e6afe99862..57787da7b4 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.db4o/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server DB4O Support -featureText = CDO Model Repository Server DB4O Support\n\ +featureName = CDO Model Repository Server DB4O Store +featureText = CDO Model Repository Server DB4O Store\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/plugin.properties b/plugins/org.eclipse.emf.cdo.server.db4o/plugin.properties index 8115a31e4c..ac67cf842c 100644 --- a/plugins/org.eclipse.emf.cdo.server.db4o/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.db4o/plugin.properties @@ -8,5 +8,5 @@ # Victor Roldan Betancort - initial API and implementation # Eike Stepper - maintenance -pluginName = CDO Model Repository Server DB4O Support +pluginName = CDO Model Repository Server DB4O Store providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF index 2291830b20..0ff3b47acb 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.server.hibernate.teneo;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -22,8 +22,8 @@ Import-Package: org.eclipse.emf.teneo;version="[2.0.0,3.0.0)", org.eclipse.emf.teneo.hibernate.annotations;version="[2.0.0,3.0.0)", org.eclipse.emf.teneo.hibernate.mapper;version="[2.0.0,3.0.0)", org.eclipse.emf.teneo.simpledom;version="[2.0.0,3.0.0)" -Export-Package: org.eclipse.emf.cdo.server.hibernate.internal.teneo;version="4.1.0";x-friends:="org.eclipse.emf.cdo.tests.hibernate", - org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle;version="4.1.0";x-friends:="org.eclipse.emf.cdo.tests.hibernate", - org.eclipse.emf.cdo.server.hibernate.teneo;version="4.1.0" +Export-Package: org.eclipse.emf.cdo.server.hibernate.internal.teneo;version="4.1.100";x-friends:="org.eclipse.emf.cdo.tests.hibernate", + org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle;version="4.1.100";x-friends:="org.eclipse.emf.cdo.tests.hibernate", + org.eclipse.emf.cdo.server.hibernate.teneo;version="4.1.100" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle.OM$Activator diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties index 5205caae5b..0eab0150e7 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server Hibernate Support (Teneo Integration) +pluginName = CDO Model Repository Server Hibernate Store (Teneo Integration) providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/about.properties b/plugins/org.eclipse.emf.cdo.server.hibernate/about.properties index e41e58dd72..385c8922d5 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server Hibernate Support -featureText = CDO Model Repository Server Hibernate Support\n\ +featureName = CDO Model Repository Server Hibernate Store +featureText = CDO Model Repository Server Hibernate Store\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties b/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties index a9055a9279..28ac6403d8 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties @@ -7,7 +7,7 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server Hibernate Support +pluginName = CDO Model Repository Server Hibernate Store providerName = Eclipse Modeling Project extension-point.name = Hibernate Mapping Provider Factories
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/about.properties b/plugins/org.eclipse.emf.cdo.server.lissome/about.properties index 6fb805f15c..3e5331fb54 100644 --- a/plugins/org.eclipse.emf.cdo.server.lissome/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.lissome/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server Lissome Support -featureText = CDO Model Repository Server Lissome Support\n\ +featureName = CDO Model Repository Server Lissome Store +featureText = CDO Model Repository Server Lissome Store\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/plugin.properties b/plugins/org.eclipse.emf.cdo.server.lissome/plugin.properties index 980cf4ecc8..08d9097262 100644 --- a/plugins/org.eclipse.emf.cdo.server.lissome/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.lissome/plugin.properties @@ -7,6 +7,6 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server Lissome Support +pluginName = CDO Model Repository Server Lissome Store providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/about.properties b/plugins/org.eclipse.emf.cdo.server.mongodb/about.properties index e25414ad4a..257f43711b 100644 --- a/plugins/org.eclipse.emf.cdo.server.mongodb/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.mongodb/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server MongoDB Support -featureText = CDO Model Repository Server MongoDB Support\n\ +featureName = CDO Model Repository Server MongoDB Store +featureText = CDO Model Repository Server MongoDB Store\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/plugin.properties b/plugins/org.eclipse.emf.cdo.server.mongodb/plugin.properties index 374e2aad65..01c95d1fca 100644 --- a/plugins/org.eclipse.emf.cdo.server.mongodb/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.mongodb/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server MongoDB Support +pluginName = CDO Model Repository Server MongoDB Store providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.objectivity.stub/META-INF/MANIFEST.MF index ef4c4bda51..e8fcbf3e7b 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.objectivity.stub/META-INF/MANIFEST.MF @@ -2,32 +2,32 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.server.objectivity.stub -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-Localization: plugin Bundle-ClassPath: oojava_epl.jar -Export-Package: com.objy.as;version="4.1.0";uses:="com.objy.pm.asexcep,com.objy.db.app,com.objy.as.app", - com.objy.as.app;version="4.1.0";uses:="com.objy.db.app,com.objy.pm.asapp", - com.objy.db;version="4.1.0";uses:="com.objy.db.app", - com.objy.db.app;version="4.1.0";uses:="com.objy.db.iapp,com.objy.ejb", - com.objy.db.iapp;version="4.1.0";uses:="com.objy.db.app,com.objy.ejb,javax.transaction.xa", - com.objy.db.util;version="4.1.0";uses:="com.objy.db.iapp,com.objy.db.app,com.objy.pm", - com.objy.ejb;version="4.1.0";uses:="com.objy.db.iapp,com.objy.db.app,javax.transaction.xa", - com.objy.pm;version="4.1.0"; +Export-Package: com.objy.as;version="4.1.100";uses:="com.objy.pm.asexcep,com.objy.db.app,com.objy.as.app", + com.objy.as.app;version="4.1.100";uses:="com.objy.db.app,com.objy.pm.asapp", + com.objy.db;version="4.1.100";uses:="com.objy.db.app", + com.objy.db.app;version="4.1.100";uses:="com.objy.db.iapp,com.objy.ejb", + com.objy.db.iapp;version="4.1.100";uses:="com.objy.db.app,com.objy.ejb,javax.transaction.xa", + com.objy.db.util;version="4.1.100";uses:="com.objy.db.iapp,com.objy.db.app,com.objy.pm", + com.objy.ejb;version="4.1.100";uses:="com.objy.db.iapp,com.objy.db.app,javax.transaction.xa", + com.objy.pm;version="4.1.100"; uses:="com.objy.db.iapp, com.objy.db.app, com.objy.pm.asapp, com.objy.db, com.objy.as.app", - com.objy.pm.asapp;version="4.1.0"; + com.objy.pm.asapp;version="4.1.100"; uses:="com.objy.db.iapp, com.objy.db.app, com.objy.as.app, com.objy.pm", - com.objy.pm.asexcep;version="4.1.0"; + com.objy.pm.asexcep;version="4.1.100"; uses:="com.objy.db.app, com.objy.as, com.objy.as.app, com.objy.pm", - com.objy.pm.tmi;version="4.1.0" + com.objy.pm.tmi;version="4.1.100" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/plugin.properties b/plugins/org.eclipse.emf.cdo.server.objectivity.stub/plugin.properties index 183b17c8f7..45f1c52844 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.objectivity.stub/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Ibrahim Sallam - initial API and implementation -pluginName = CDO Model Repository Server Objectivity Support (Driver Stub) +pluginName = CDO Model Repository Server Objectivity Store (Driver Stub) providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/about.properties b/plugins/org.eclipse.emf.cdo.server.objectivity/about.properties index ba42c9ed23..58cea53cc1 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/about.properties +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/about.properties @@ -16,8 +16,8 @@ # append it to the end of the file, and change the code to use the new name. # ============================================================================== -featureName = CDO Model Repository Server Objectivity Support -featureText = CDO Model Repository Server Objectivity Support\n\ +featureName = CDO Model Repository Server Objectivity Store +featureText = CDO Model Repository Server Objectivity Store\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/plugin.properties b/plugins/org.eclipse.emf.cdo.server.objectivity/plugin.properties index 1fffdb7e30..6601141aad 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/plugin.properties @@ -7,5 +7,5 @@ # Contributors: # Eike Stepper - initial API and implementation -pluginName = CDO Model Repository Server Objectivity Support +pluginName = CDO Model Repository Server Objectivity Store providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/.project b/plugins/org.eclipse.emf.cdo.tests.model6/.project index 9c028306be..42aa73d8c0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/.project +++ b/plugins/org.eclipse.emf.cdo.tests.model6/.project @@ -16,13 +16,18 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <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.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.project b/plugins/org.eclipse.emf.cdo.workspace.efs/.project index 27c051c635..b5c343a1e3 100644 --- a/plugins/org.eclipse.emf.cdo.workspace.efs/.project +++ b/plugins/org.eclipse.emf.cdo.workspace.efs/.project @@ -16,13 +16,17 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <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> @@ -30,5 +34,6 @@ <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.workspace/.project b/plugins/org.eclipse.emf.cdo.workspace/.project index 1f2760431c..12e1a8906e 100644 --- a/plugins/org.eclipse.emf.cdo.workspace/.project +++ b/plugins/org.eclipse.emf.cdo.workspace/.project @@ -16,13 +16,17 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <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> @@ -30,5 +34,6 @@ <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.core.resources.prefs index 0263ddb3ea..f06cc0ffca 100644 --- a/plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.workspace/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 12:56:39 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF index ec86021070..aaa0b92719 100644 --- a/plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.workspace/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.workspace;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resoluti org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.emf.cdo.internal.workspace;version="4.1.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db,org.eclipse.emf.cdo.ui.workspace", - org.eclipse.emf.cdo.internal.workspace.bundle;version="4.1.0";x-internal:=true, - org.eclipse.emf.cdo.spi.workspace;version="4.1.0", - org.eclipse.emf.cdo.workspace;version="4.1.0" +Export-Package: org.eclipse.emf.cdo.internal.workspace;version="4.1.100";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db,org.eclipse.emf.cdo.ui.workspace", + org.eclipse.emf.cdo.internal.workspace.bundle;version="4.1.100";x-internal:=true, + org.eclipse.emf.cdo.spi.workspace;version="4.1.100", + org.eclipse.emf.cdo.workspace;version="4.1.100" diff --git a/plugins/org.eclipse.net4j.debug/.project b/plugins/org.eclipse.net4j.debug/.project index 5023f97e18..fe80cb328e 100644 --- a/plugins/org.eclipse.net4j.debug/.project +++ b/plugins/org.eclipse.net4j.debug/.project @@ -16,13 +16,17 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <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> @@ -30,5 +34,6 @@ <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature> </natures> </projectDescription> |