diff options
94 files changed, 341 insertions, 475 deletions
diff --git a/features/org.eclipse.emf.cdo-feature/feature.xml b/features/org.eclipse.emf.cdo-feature/feature.xml index d510ef1c93..10e6bb343d 100644 --- a/features/org.eclipse.emf.cdo-feature/feature.xml +++ b/features/org.eclipse.emf.cdo-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml index a0aedec141..6808968617 100644 --- a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.dawn" label="%featureName" - version="0.2.0.qualifier" + version="1.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.dawn.codegen-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.codegen-feature/feature.xml index 58aae38c1f..3a787fb460 100644 --- a/features/org.eclipse.emf.cdo.dawn.codegen-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.dawn.codegen-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.dawn.codegen" label="%featureName" - version="0.2.0.qualifier" + version="1.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml index f5af04dd7e..d42b13b8b6 100644 --- a/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.dawn.examples-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.dawn.examples" label="%featureName" - version="0.2.0.qualifier" + version="1.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.xml index c6d652322b..2dd45be77a 100644 --- a/features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.dawn.sdk-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.dawn.sdk" label="%featureName" - version="0.2.0.qualifier" + version="1.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.defs-feature/feature.xml b/features/org.eclipse.emf.cdo.defs-feature/feature.xml index 36e388a989..40a2de0f3e 100644 --- a/features/org.eclipse.emf.cdo.defs-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.defs-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.defs" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.doc-feature/feature.xml b/features/org.eclipse.emf.cdo.doc-feature/feature.xml index b186efae39..8d13a3a3d5 100644 --- a/features/org.eclipse.emf.cdo.doc-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.doc-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.doc" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.epp-feature/feature.xml b/features/org.eclipse.emf.cdo.epp-feature/feature.xml index 91d565738e..3421a5d4fd 100644 --- a/features/org.eclipse.emf.cdo.epp-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.epp-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.epp" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.examples-feature/feature.xml index 2b0e13f8e2..13906246c4 100644 --- a/features/org.eclipse.emf.cdo.examples-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.examples-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.examples" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml index 7bf23836dd..bcf9868cac 100644 --- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.sdk" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml index b328dd830a..a8103c3b8c 100644 --- a/features/org.eclipse.emf.cdo.server-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.server" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.server.db-feature/feature.xml b/features/org.eclipse.emf.cdo.server.db-feature/feature.xml index 714b58d76c..a367bbfd8d 100644 --- a/features/org.eclipse.emf.cdo.server.db-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.db-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.server.db" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml index 9ea6653242..f4e5932f73 100644 --- a/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.hibernate-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.server.hibernate" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml index 3501501304..43deb96dc7 100644 --- a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml @@ -13,7 +13,7 @@ <feature id="org.eclipse.emf.cdo.server.objectivity" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.server.product-feature/feature.xml b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml index b3ccac2e70..4482e62ba7 100644 --- a/features/org.eclipse.emf.cdo.server.product-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.server.product" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml index f81a7daa49..522ad7b139 100644 --- a/features/org.eclipse.emf.cdo.site-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.site" label="CDO Model Repository Site" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml index a2ba7d9d0e..eb611189ce 100644 --- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.tests" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml index 1e8b071539..8c5766d52e 100644 --- a/features/org.eclipse.net4j-feature/feature.xml +++ b/features/org.eclipse.net4j-feature/feature.xml @@ -13,7 +13,7 @@ <feature id="org.eclipse.net4j" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j.db-feature/feature.xml b/features/org.eclipse.net4j.db-feature/feature.xml index e5d27572d4..a819136292 100644 --- a/features/org.eclipse.net4j.db-feature/feature.xml +++ b/features/org.eclipse.net4j.db-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.db" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j.db.derby-feature/feature.xml b/features/org.eclipse.net4j.db.derby-feature/feature.xml index 0431640706..98d4618792 100644 --- a/features/org.eclipse.net4j.db.derby-feature/feature.xml +++ b/features/org.eclipse.net4j.db.derby-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.db.derby" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j.db.h2-feature/feature.xml b/features/org.eclipse.net4j.db.h2-feature/feature.xml index eb90c056ba..ee70968617 100644 --- a/features/org.eclipse.net4j.db.h2-feature/feature.xml +++ b/features/org.eclipse.net4j.db.h2-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.db.h2" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml b/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml index 95de784461..4c7b53f07f 100644 --- a/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml +++ b/features/org.eclipse.net4j.db.hsqldb-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.db.hsqldb" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j.db.mysql-feature/feature.xml b/features/org.eclipse.net4j.db.mysql-feature/feature.xml index 1576a261f1..bc8a987f96 100644 --- a/features/org.eclipse.net4j.db.mysql-feature/feature.xml +++ b/features/org.eclipse.net4j.db.mysql-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.db.mysql" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j.db.postgresql-feature/feature.xml b/features/org.eclipse.net4j.db.postgresql-feature/feature.xml index e26b2fb76e..bed985dc33 100644 --- a/features/org.eclipse.net4j.db.postgresql-feature/feature.xml +++ b/features/org.eclipse.net4j.db.postgresql-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.db.postgresql" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j.defs-feature/feature.xml b/features/org.eclipse.net4j.defs-feature/feature.xml index c6d086acc1..46a3bb7f5c 100644 --- a/features/org.eclipse.net4j.defs-feature/feature.xml +++ b/features/org.eclipse.net4j.defs-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.defs" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j.examples-feature/feature.xml b/features/org.eclipse.net4j.examples-feature/feature.xml index 71ab0c6af5..5484720d90 100644 --- a/features/org.eclipse.net4j.examples-feature/feature.xml +++ b/features/org.eclipse.net4j.examples-feature/feature.xml @@ -13,7 +13,7 @@ id="org.eclipse.net4j.examples" label="%featureName" image="eclipse_update_120.jpg" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName"> <description> diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml index 0bbb928143..8bb94a014f 100644 --- a/features/org.eclipse.net4j.sdk-feature/feature.xml +++ b/features/org.eclipse.net4j.sdk-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.sdk" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j.tests-feature/feature.xml b/features/org.eclipse.net4j.tests-feature/feature.xml index 7489172ad2..c69446a1a1 100644 --- a/features/org.eclipse.net4j.tests-feature/feature.xml +++ b/features/org.eclipse.net4j.tests-feature/feature.xml @@ -13,7 +13,7 @@ id="org.eclipse.net4j.tests" label="%featureName" image="eclipse_update_120.jpg" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName"> <description> diff --git a/features/org.eclipse.net4j.ui-feature/feature.xml b/features/org.eclipse.net4j.ui-feature/feature.xml index 7ac85af99a..3e4599f267 100644 --- a/features/org.eclipse.net4j.ui-feature/feature.xml +++ b/features/org.eclipse.net4j.ui-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.ui" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.gastro-feature/feature.xml b/features/org.gastro-feature/feature.xml index 84c7526a7f..ba598a5e9f 100644 --- a/features/org.gastro-feature/feature.xml +++ b/features/org.gastro-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.gastro" label="%featureName" - version="3.0.0.qualifier" + version="4.0.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF index 5e5494a640..d3ffb238e8 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn;singleton:=true -Bundle-Version: 0.2.0.qualifier +Bundle-Version: 1.0.0.qualifier Fragment-Host: org.eclipse.emf.cdo.dawn.examples.acore.diagram;bundle-version="0.2.0.qualifier" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Localization: plugin -Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[0.2.0,1.0.0)", +Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[1.0.0,2.0.0)", org.eclipse.emf.cdo.dawn.util;bundle-version="[0.2.0,1.0.0)", - org.eclipse.emf.cdo.ui;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.dawn.ui;bundle-version="[0.2.0,1.0.0)" -Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;version="0.2.0" +Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;version="1.0.0" Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF index bbffece676..a9d40523f6 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF @@ -2,21 +2,21 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.diagram; singleton:=true -Bundle-Version: 0.2.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet;version="0.2.0" +Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet;version="1.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", @@ -41,7 +41,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.4.0,2.0.0)";visibility:=reexport, org.eclipse.gef;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, org.eclipse.draw2d;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[0.2.0,1.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.dawn.examples.acore.edit;bundle-version="[0.2.0,1.0.0)";visibility:=reexport + org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.dawn.examples.acore.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF index 538f3e1f3c..89953b0ebd 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.edit;singleton:=true -Bundle-Version: 0.2.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.provider.AcoreEditPlugin$Implementation Bundle-Vendor: %providerName @@ -10,6 +10,6 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.provider;version="0.2.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", - org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[0.2.0,1.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.dawn.examples.acore;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, org.eclipse.emf.edit;bundle-version="[2.6.0,3.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF index f88c63f23c..b34e9b7a78 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore;singleton:=true -Bundle-Version: 0.2.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.dawn.examples.acore;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.impl;version="0.2.0", - org.eclipse.emf.cdo.dawn.examples.acore.util;version="0.2.0", - org.eclipse.emf.cdo.internal.dawn.examples.acore.bundle;version="0.2.0" +Export-Package: org.eclipse.emf.cdo.dawn.examples.acore;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.impl;version="1.0.0", + org.eclipse.emf.cdo.dawn.examples.acore.util;version="1.0.0", + org.eclipse.emf.cdo.internal.dawn.examples.acore.bundle;version="1.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.6.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF index 48429d4796..d3476d4929 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-Version: 0.2.100.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.ui.Activator Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", - org.eclipse.emf.cdo.ui;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.dawn.util;bundle-version="[0.2.0,1.0.0)", - org.eclipse.emf.cdo.dawn;bundle-version="[0.2.0,1.0.0)" + org.eclipse.emf.cdo.dawn;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF index a167798f41..2d57480703 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.util;singleton:=true -Bundle-Version: 0.2.0.qualifier +Bundle-Version: 0.2.100.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.util.Activator Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)", - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", - org.eclipse.emf.cdo.net4j;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)", org.eclipse.gmf.runtime.common.core;bundle-version="[1.4.0,2.0.0)", org.eclipse.gmf.runtime.common.ui;bundle-version="[1.4.0,2.0.0)", org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.3.0,2.0.0)", @@ -23,9 +23,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.2.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.dawn.internal.util.bundle;version="0.2.0", - org.eclipse.emf.cdo.dawn.util;version="0.2.0", - org.eclipse.emf.cdo.dawn.util.connection;version="0.2.0", - org.eclipse.emf.cdo.dawn.util.exceptions;version="0.2.0" +Export-Package: org.eclipse.emf.cdo.dawn.internal.util.bundle;version="0.2.100", + org.eclipse.emf.cdo.dawn.util;version="0.2.100", + org.eclipse.emf.cdo.dawn.util.connection;version="0.2.100", + org.eclipse.emf.cdo.dawn.util.exceptions;version="0.2.100" Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF index 3841ac3016..23b4d85b2c 100644 --- a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn;singleton:=true -Bundle-Version: 0.2.100.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.DawnRuntimePlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)", - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.dawn.util;bundle-version="[0.2.0,1.0.0)", org.eclipse.gmf.runtime.common.core;bundle-version="[1.4.0,2.0.0)", org.eclipse.gmf.runtime.common.ui;bundle-version="[1.4.0,2.0.0)", @@ -23,23 +23,23 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.2.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.dawn;version="0.2.100", - org.eclipse.emf.cdo.dawn.actions;version="0.2.100", - org.eclipse.emf.cdo.dawn.appearance;version="0.2.100", - org.eclipse.emf.cdo.dawn.appearance.impl;version="0.2.100", - org.eclipse.emf.cdo.dawn.commands;version="0.2.100", - org.eclipse.emf.cdo.dawn.conflicts;version="0.2.100", - org.eclipse.emf.cdo.dawn.editors;version="0.2.100", - org.eclipse.emf.cdo.dawn.editors.impl;version="0.2.100", - org.eclipse.emf.cdo.dawn.elementtypes;version="0.2.100", - org.eclipse.emf.cdo.dawn.exceptions;version="0.2.100", - org.eclipse.emf.cdo.dawn.helper;version="0.2.100", - org.eclipse.emf.cdo.dawn.notifications;version="0.2.100", - org.eclipse.emf.cdo.dawn.preferences;version="0.2.100", - org.eclipse.emf.cdo.dawn.resources;version="0.2.100", - org.eclipse.emf.cdo.dawn.resources.impl;version="0.2.100", - org.eclipse.emf.cdo.dawn.synchronize;version="0.2.100", - org.eclipse.emf.cdo.dawn.transaction;version="0.2.100", - org.eclipse.emf.cdo.dawn.views;version="0.2.100", - org.eclipse.emf.cdo.internal.dawn.bundle;version="0.2.100" +Export-Package: org.eclipse.emf.cdo.dawn;version="1.0.0", + org.eclipse.emf.cdo.dawn.actions;version="1.0.0", + org.eclipse.emf.cdo.dawn.appearance;version="1.0.0", + org.eclipse.emf.cdo.dawn.appearance.impl;version="1.0.0", + org.eclipse.emf.cdo.dawn.commands;version="1.0.0", + org.eclipse.emf.cdo.dawn.conflicts;version="1.0.0", + org.eclipse.emf.cdo.dawn.editors;version="1.0.0", + org.eclipse.emf.cdo.dawn.editors.impl;version="1.0.0", + org.eclipse.emf.cdo.dawn.elementtypes;version="1.0.0", + org.eclipse.emf.cdo.dawn.exceptions;version="1.0.0", + org.eclipse.emf.cdo.dawn.helper;version="1.0.0", + org.eclipse.emf.cdo.dawn.notifications;version="1.0.0", + org.eclipse.emf.cdo.dawn.preferences;version="1.0.0", + org.eclipse.emf.cdo.dawn.resources;version="1.0.0", + org.eclipse.emf.cdo.dawn.resources.impl;version="1.0.0", + org.eclipse.emf.cdo.dawn.synchronize;version="1.0.0", + org.eclipse.emf.cdo.dawn.transaction;version="1.0.0", + org.eclipse.emf.cdo.dawn.views;version="1.0.0", + org.eclipse.emf.cdo.internal.dawn.bundle;version="1.0.0" Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF index e4d3302d68..e94bd43858 100644 --- a/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.defs;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.net4j.defs;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.net4j.util.defs;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.emf.cdo.defs;version="3.0.0", - org.eclipse.emf.cdo.defs.impl;version="3.0.0", - org.eclipse.emf.cdo.defs.util;version="3.0.0" +Export-Package: org.eclipse.emf.cdo.defs;version="4.0.0", + org.eclipse.emf.cdo.defs.impl;version="4.0.0", + org.eclipse.emf.cdo.defs.util;version="4.0.0" diff --git a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF index 42d9144fda..77eeac90ab 100644 --- a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.edit; singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.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)", org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.edit;version="3.0.0", - org.eclipse.emf.cdo.eresource.provider;version="3.0.0", - org.eclipse.emf.cdo.internal.edit.messages;version="3.0.0";x-internal:=true + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.edit;version="4.0.0", + org.eclipse.emf.cdo.eresource.provider;version="4.0.0", + org.eclipse.emf.cdo.internal.edit.messages;version="4.0.0";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF index 96f4ac14bc..681252a001 100644 --- a/plugins/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.company.edit; singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,6 +11,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.examples.company;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.examples.company;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Export-Package: org.eclipse.emf.cdo.examples.company.provider;version="3.0.0" diff --git a/plugins/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF index 85f20eae5d..5f235fec23 100644 --- a/plugins/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.company/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.company; singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin 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="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.examples.company;version="3.0.0", - org.eclipse.emf.cdo.examples.company.impl;version="3.0.0", - org.eclipse.emf.cdo.examples.company.util;version="3.0.0", - org.eclipse.emf.cdo.examples.company.validation;version="3.0.0" + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.examples.company;version="4.0.0", + org.eclipse.emf.cdo.examples.company.impl;version="4.0.0", + org.eclipse.emf.cdo.examples.company.util;version="4.0.0", + org.eclipse.emf.cdo.examples.company.validation;version="4.0.0" diff --git a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF index 3b386cd79b..6e3045ecce 100644 --- a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.emf.cdo.internal.examples.bundle.OM$Activator @@ -9,10 +9,10 @@ Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.examples.company;bundle-version="[3.0.0,4.0.0)" + org.eclipse.emf.cdo.examples.company;bundle-version="[4.0.0,5.0.0)" Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.emf.cdo.examples;version="3.0.0", - org.eclipse.emf.cdo.internal.examples.bundle;version="3.0.0";x-internal:=true +Export-Package: org.eclipse.emf.cdo.examples;version="4.0.0", + org.eclipse.emf.cdo.internal.examples.bundle;version="4.0.0";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF index 2b7cc5d8d0..80fc4ae107 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF @@ -2,26 +2,26 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.net4j; singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-Activator: org.eclipse.emf.cdo.internal.net4j.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.internal.net4j;version="3.0.100"; +Export-Package: org.eclipse.emf.cdo.internal.net4j;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.examples", - org.eclipse.emf.cdo.internal.net4j.bundle;version="3.0.100";x-friends:="org.eclipse.emf.cdo.tests", - org.eclipse.emf.cdo.internal.net4j.messages;version="3.0.100";x-internal:=true, - org.eclipse.emf.cdo.internal.net4j.protocol;version="3.0.100"; + org.eclipse.emf.cdo.internal.net4j.bundle;version="4.0.0";x-friends:="org.eclipse.emf.cdo.tests", + org.eclipse.emf.cdo.internal.net4j.messages;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.internal.net4j.protocol;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.examples", - org.eclipse.emf.cdo.net4j;version="3.0.100" + org.eclipse.emf.cdo.net4j;version="4.0.0" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java index d89382912e..e7d23897d1 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java @@ -48,6 +48,7 @@ import org.eclipse.net4j.util.io.StringIO; import org.eclipse.net4j.util.om.monitor.OMMonitor; import org.eclipse.net4j.util.om.trace.PerfTracer; +import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.spi.cdo.AbstractQueryIterator; @@ -260,9 +261,9 @@ public class CDOClientProtocol extends SignalProtocol<CDOSession> implements CDO } public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment, - CDOCommitData commitData, OMMonitor monitor) + CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, OMMonitor monitor) { - return send(new CommitDelegationRequest(this, branch, userID, comment, commitData), monitor); + return send(new CommitDelegationRequest(this, branch, userID, comment, commitData, detachedObjectTypes), monitor); } public CommitTransactionResult commitXATransactionPhase1(InternalCDOXACommitContext xaContext, OMMonitor monitor) diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitDelegationRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitDelegationRequest.java index 3c90c2573c..37d2687cc9 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitDelegationRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitDelegationRequest.java @@ -19,7 +19,10 @@ import org.eclipse.emf.cdo.common.protocol.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry.MetaInstanceMapper; +import org.eclipse.emf.ecore.EClass; + import java.io.IOException; +import java.util.Map; /** * @author Eike Stepper @@ -32,14 +35,17 @@ public class CommitDelegationRequest extends CommitTransactionRequest private String userID; + private Map<CDOID, EClass> detachedObjectTypes; + public CommitDelegationRequest(CDOClientProtocol protocol, CDOBranch branch, String userID, String comment, - CDOCommitData commitData) + CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes) { super(protocol, CDOProtocolConstants.SIGNAL_COMMIT_DELEGATION, UNKNOWN_TRANSACTION_ID, comment, false, CDOIDProvider.NOOP, commitData); this.branch = branch; this.userID = userID; + this.detachedObjectTypes = detachedObjectTypes; } @Override @@ -50,6 +56,12 @@ public class CommitDelegationRequest extends CommitTransactionRequest } @Override + protected EClass getObjectType(CDOID id) + { + return detachedObjectTypes.get(id); + } + + @Override protected void remapMetaInstanceID(MetaInstanceMapper metaInstanceMapper, CDOIDTemp oldID, CDOID newID) { // Do nothing diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java index 59a61be615..48110849dc 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java @@ -195,26 +195,26 @@ public class CommitTransactionRequest extends RequestWithMonitoring<CommitTransa TRACER.format("Writing {0} detached objects", detachedObjects.size()); //$NON-NLS-1$ } - CDOTransaction transaction = null; boolean ensuringReferentialIntegrity = getSession().getRepositoryInfo().isEnsuringReferentialIntegrity(); - if (ensuringReferentialIntegrity) - { - transaction = (CDOTransaction)getSession().getView(transactionID); - } - for (CDOIDAndVersion detachedObject : detachedObjects) { CDOID id = detachedObject.getID(); out.writeCDOID(id); if (ensuringReferentialIntegrity) { - CDOObject object = transaction.getObject(id); - EClass eClass = object.eClass(); + EClass eClass = getObjectType(id); out.writeCDOClassifierRef(eClass); } } } + protected EClass getObjectType(CDOID id) + { + CDOTransaction transaction = (CDOTransaction)getSession().getView(transactionID); + CDOObject object = transaction.getObject(id); + return object.eClass(); + } + @Override protected final CommitTransactionResult confirming(ExtendedDataInputStream in, OMMonitor monitor) throws Exception { diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters deleted file mode 100644 index f9b693c521..0000000000 --- a/plugins/org.eclipse.emf.cdo.server.objectivity.stub/.settings/.api_filters +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.emf.cdo.server.objectivity.stub" version="2"> - <resource path="META-INF/MANIFEST.MF"> - <filter id="924844039"> - <message_arguments> - <message_argument value="3.0.100.qualifier"/> - <message_argument value="3.0.0.v20100614-1655"/> - </message_arguments> - </filter> - </resource> -</component> diff --git a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters index bec972e28f..5aa94469f8 100644 --- a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters @@ -9,15 +9,6 @@ </message_arguments> </filter> </resource> - <resource path="src/org/eclipse/emf/cdo/internal/server/Repository.java" type="org.eclipse.emf.cdo.internal.server.Repository"> - <filter id="574660632"> - <message_arguments> - <message_argument value="InternalRepository"/> - <message_argument value="CDOCommonRepository"/> - <message_argument value="Repository"/> - </message_arguments> - </filter> - </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionConfiguration.java" type="org.eclipse.emf.cdo.internal.server.embedded.EmbeddedClientSessionConfiguration$RepositoryInfo"> <filter id="574660632"> <message_arguments> diff --git a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF index a833b79e5f..91c48b9945 100644 --- a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.emf.cdo.internal.server.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.util;bundle-version="[3.1.0,4.0.0)";visibility:=reexport Export-Package: org.eclipse.emf.cdo.internal.server;version="4.0.0";x-friends:="org.eclipse.emf.cdo.server.db,org.eclipse.emf.cdo.server.net4j,org.eclipse.emf.cdo.tests", org.eclipse.emf.cdo.internal.server.bundle;version="4.0.0";x-internal:=true, diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java index e8ec2ed55c..8d7aee9758 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java @@ -51,6 +51,7 @@ import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType; import org.eclipse.net4j.util.lifecycle.Lifecycle; import org.eclipse.net4j.util.om.monitor.OMMonitor; +import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.spi.cdo.AbstractQueryIterator; @@ -379,7 +380,7 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi } public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment, - CDOCommitData commitData, OMMonitor monitor) + CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, OMMonitor monitor) { throw new UnsupportedOperationException(); } diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java index a80fa44d53..0f3dfa443f 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java @@ -247,7 +247,8 @@ public class OfflineClone extends SynchronizableRepository // Delegate commit to the master CDOSessionProtocol sessionProtocol = getSynchronizer().getRemoteSession().getSessionProtocol(); - CommitTransactionResult result = sessionProtocol.commitDelegation(branch, userID, comment, commitData, monitor); + CommitTransactionResult result = sessionProtocol.commitDelegation(branch, userID, comment, commitData, + getDetachedObjectTypes(), monitor); // Stop if commit to master failed String rollbackMessage = result.getRollbackMessage(); diff --git a/plugins/org.eclipse.emf.cdo.team/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.team/META-INF/MANIFEST.MF index 63a1da3b4e..39846f8d85 100644 --- a/plugins/org.eclipse.emf.cdo.team/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.team/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.team;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,7 +12,7 @@ Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.team.core;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.internal.team;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.ide", - org.eclipse.emf.cdo.internal.team.bundle;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.team;version="3.0.0" + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.internal.team;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.ide", + org.eclipse.emf.cdo.internal.team.bundle;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.team;version="4.0.0" diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF index fc5fd8ee30..37ba4a9d79 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)", - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.hibernate;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF index 163aeb25ec..8cf5a07767 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mango; singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -9,9 +9,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.tests.legacy.mango.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.mango;version="3.0.0", - org.eclipse.emf.cdo.tests.mango.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.mango.util;version="3.0.0" + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.tests.legacy.mango.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.mango;version="3.0.100", + org.eclipse.emf.cdo.tests.mango.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.mango.util;version="3.0.100" diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF index f22a328bca..ac6ac28f48 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF @@ -1,17 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model1; singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin 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="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.tests.legacy.model1;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model1.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.model1;version="3.0.0", - org.eclipse.emf.cdo.tests.model1.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.model1.util;version="3.0.0", - org.eclipse.emf.cdo.tests.model1.validation;version="3.0.0" + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.tests.legacy.model1;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model1.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.model1;version="3.0.100", + org.eclipse.emf.cdo.tests.model1.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.model1.util;version="3.0.100", + org.eclipse.emf.cdo.tests.model1.validation;version="3.0.100" diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF index 56e3f73290..8ef39c20ce 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model2; singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -9,11 +9,11 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.tests.model1;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.tests.legacy.model2;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model2.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model2.util;version="3.0.0", - org.eclipse.emf.cdo.tests.model2;version="3.0.0", - org.eclipse.emf.cdo.tests.model2.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.model2.util;version="3.0.0" +Export-Package: org.eclipse.emf.cdo.tests.legacy.model2;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model2.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model2.util;version="3.0.100", + org.eclipse.emf.cdo.tests.model2;version="3.0.100", + org.eclipse.emf.cdo.tests.model2.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.model2.util;version="3.0.100" diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF index b7e3a9b9e7..f55df1a4ff 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model3; singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -9,16 +9,16 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.tests.legacy.model3;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model3.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model3.subpackage;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model3.subpackage.util;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model3.util;version="3.0.0", - org.eclipse.emf.cdo.tests.model3;version="3.0.0", - org.eclipse.emf.cdo.tests.model3.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.model3.subpackage;version="3.0.0", - org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.model3.subpackage.util;version="3.0.0", - org.eclipse.emf.cdo.tests.model3.util;version="3.0.0" + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.tests.legacy.model3;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model3.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model3.subpackage;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model3.subpackage.util;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model3.util;version="3.0.100", + org.eclipse.emf.cdo.tests.model3;version="3.0.100", + org.eclipse.emf.cdo.tests.model3.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.model3.subpackage;version="3.0.100", + org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.model3.subpackage.util;version="3.0.100", + org.eclipse.emf.cdo.tests.model3.util;version="3.0.100" diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF index d72e77e75e..af1392978d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF @@ -2,19 +2,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model4;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.tests.legacy.model4;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model4.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model4.util;version="3.0.0", - org.eclipse.emf.cdo.tests.model4;version="3.0.0", - org.eclipse.emf.cdo.tests.model4.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.model4.util;version="3.0.0", - org.eclipse.emf.cdo.tests.model4.validation;version="3.0.0" +Export-Package: org.eclipse.emf.cdo.tests.legacy.model4;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model4.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model4.util;version="3.0.100", + org.eclipse.emf.cdo.tests.model4;version="3.0.100", + org.eclipse.emf.cdo.tests.model4.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.model4.util;version="3.0.100", + org.eclipse.emf.cdo.tests.model4.validation;version="3.0.100" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.tests.model4interfaces;bundle-version="[3.0.0,4.0.0)";visibility:=reexport diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF index 34b94c9220..0db3cf7d7a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model4interfaces;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.tests.legacy.model4interfaces;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model4interfaces.util;version="3.0.0", - org.eclipse.emf.cdo.tests.model4interfaces;version="3.0.0", - org.eclipse.emf.cdo.tests.model4interfaces.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.model4interfaces.util;version="3.0.0" +Export-Package: org.eclipse.emf.cdo.tests.legacy.model4interfaces;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model4interfaces.util;version="3.0.100", + org.eclipse.emf.cdo.tests.model4interfaces;version="3.0.100", + org.eclipse.emf.cdo.tests.model4interfaces.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.model4interfaces.util;version="3.0.100" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF index e55c4cae20..37c7aec146 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF @@ -1,17 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model5;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin 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="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.tests.legacy.model5;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model5.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.legacy.model5.util;version="3.0.0", - org.eclipse.emf.cdo.tests.model5;version="3.0.0", - org.eclipse.emf.cdo.tests.model5.impl;version="3.0.0", - org.eclipse.emf.cdo.tests.model5.util;version="3.0.0" + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.tests.legacy.model5;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model5.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.legacy.model5.util;version="3.0.100", + org.eclipse.emf.cdo.tests.model5;version="3.0.100", + org.eclipse.emf.cdo.tests.model5.impl;version="3.0.100", + org.eclipse.emf.cdo.tests.model5.util;version="3.0.100" diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF index 296e6e3d21..47dab6d6e1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF @@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.net4j.tests;bundle-version="[3.0.0,4.0.0)";visibilit org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)", org.eclipse.emf.cdo.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.common.db;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.tests.mango;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.net4j.tests;bundle-version="[3.0.0,4.0.0)";visibilit org.eclipse.emf.cdo.tests.model4;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.tests.model4interfaces;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.tests.model5;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.defs;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.emf.cdo.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: org.apache.derby.jdbc;version="[10.0.0,11.0.0)", org.h2.jdbcx;version="[1.1.0,1.2.0)" Export-Package: base;version="4.0.0", diff --git a/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF index 0943c7af6c..2dd1ce2624 100644 --- a/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Activator: org.eclipse.emf.cdo.ui.internal.branch.bundle.OM$Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.net4j;bundle-version="3.0.0", org.eclipse.emf.cdo.examples.company;bundle-version="3.0.0", org.eclipse.net4j.tcp;bundle-version="3.0.0", diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF index f26f1f5de7..5fdf869c14 100644 --- a/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.ui.defs;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.ui.defs;version="3.0.0", - org.eclipse.emf.cdo.ui.defs.impl;version="3.0.0", - org.eclipse.emf.cdo.ui.defs.util;version="3.0.0" -Require-Bundle: org.eclipse.emf.cdo.defs;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.ui.defs;version="4.0.0", + org.eclipse.emf.cdo.ui.defs.impl;version="4.0.0", + org.eclipse.emf.cdo.ui.defs.util;version="4.0.0" +Require-Bundle: org.eclipse.emf.cdo.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF index 5d890331b1..917f35e9cf 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui.ide/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.ui.ide;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,14 +10,14 @@ Bundle-Activator: org.eclipse.emf.cdo.ui.internal.ide.bundle.OM$Activator 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.team;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.team;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.team.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.ui.navigator;bundle-version="[3.3.0,4.0.0)";visibility:=reexport, org.eclipse.ui.navigator.resources;bundle-version="[3.3.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.ui.ide;version="3.0.0", - org.eclipse.emf.cdo.ui.internal.ide.actions;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.ui.internal.ide.bundle;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.ui.internal.ide.messages;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.ui.internal.ide.wizards;version="3.0.0";x-internal:=true + org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.ui.ide;version="4.0.0", + org.eclipse.emf.cdo.ui.internal.ide.actions;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.ui.internal.ide.bundle;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.ui.internal.ide.messages;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.ui.internal.ide.wizards;version="4.0.0";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF index 58f126f92f..9e4726f7bb 100644 --- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.ui;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.emf.cdo.internal.ui.bundle.OM$Activator Bundle-Vendor: %providerName Bundle-ClassPath: . @@ -16,20 +16,20 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.internal.ui;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide", - org.eclipse.emf.cdo.internal.ui.actions;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide", - org.eclipse.emf.cdo.internal.ui.bundle;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.internal.ui.dialogs;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide", - org.eclipse.emf.cdo.internal.ui.dnd;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.internal.ui.editor;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide,org.eclipse.emf.cdo.dawn.ui", - org.eclipse.emf.cdo.internal.ui.filters;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.internal.ui.messages;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.internal.ui.perspectives;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.ide", - org.eclipse.emf.cdo.internal.ui.preferences;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide", - org.eclipse.emf.cdo.internal.ui.properties;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide", - org.eclipse.emf.cdo.internal.ui.views;version="3.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide,org.eclipse.emf.cdo.dawn.ui", - org.eclipse.emf.cdo.ui;version="3.0.0", - org.eclipse.emf.cdo.ui.widgets;version="3.0.0" + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide", + org.eclipse.emf.cdo.internal.ui.actions;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide", + org.eclipse.emf.cdo.internal.ui.bundle;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.internal.ui.dialogs;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide", + org.eclipse.emf.cdo.internal.ui.dnd;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.internal.ui.editor;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide,org.eclipse.emf.cdo.dawn.ui", + org.eclipse.emf.cdo.internal.ui.filters;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.internal.ui.messages;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.internal.ui.perspectives;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.ide", + org.eclipse.emf.cdo.internal.ui.preferences;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide", + org.eclipse.emf.cdo.internal.ui.properties;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide", + org.eclipse.emf.cdo.internal.ui.views;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui.defs,org.eclipse.emf.cdo.ui.ide,org.eclipse.emf.cdo.dawn.ui", + org.eclipse.emf.cdo.ui;version="4.0.0", + org.eclipse.emf.cdo.ui.widgets;version="4.0.0" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF index acabea074e..593a4eaf8e 100644 --- a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo; singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -13,67 +13,67 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.emf.cdo.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo;version="3.1.0", - org.eclipse.emf.cdo.eresource;version="3.1.0", - org.eclipse.emf.cdo.eresource.impl;version="3.1.0", - org.eclipse.emf.cdo.eresource.util;version="3.1.0", - org.eclipse.emf.cdo.eresource.validation;version="3.1.0", - org.eclipse.emf.cdo.session;version="3.1.0", - org.eclipse.emf.cdo.session.remote;version="3.1.0", - org.eclipse.emf.cdo.transaction;version="3.1.0", - org.eclipse.emf.cdo.util;version="3.1.0", - org.eclipse.emf.cdo.view;version="3.1.0", - org.eclipse.emf.internal.cdo;version="3.1.0", - org.eclipse.emf.internal.cdo.analyzer;version="3.1.0"; +Export-Package: org.eclipse.emf.cdo;version="4.0.0", + org.eclipse.emf.cdo.eresource;version="4.0.0", + org.eclipse.emf.cdo.eresource.impl;version="4.0.0", + org.eclipse.emf.cdo.eresource.util;version="4.0.0", + org.eclipse.emf.cdo.eresource.validation;version="4.0.0", + org.eclipse.emf.cdo.session;version="4.0.0", + org.eclipse.emf.cdo.session.remote;version="4.0.0", + org.eclipse.emf.cdo.transaction;version="4.0.0", + org.eclipse.emf.cdo.util;version="4.0.0", + org.eclipse.emf.cdo.view;version="4.0.0", + org.eclipse.emf.internal.cdo;version="4.0.0", + org.eclipse.emf.internal.cdo.analyzer;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.bundle;version="3.1.0";x-friends:="org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.messages;version="3.1.0";x-internal:=true, - org.eclipse.emf.internal.cdo.query;version="3.1.0"; + org.eclipse.emf.internal.cdo.bundle;version="4.0.0";x-friends:="org.eclipse.emf.cdo.ui", + org.eclipse.emf.internal.cdo.messages;version="4.0.0";x-internal:=true, + org.eclipse.emf.internal.cdo.query;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.tests.objectivity", - org.eclipse.emf.internal.cdo.revision;version="3.1.0"; + org.eclipse.emf.internal.cdo.revision;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.session;version="3.1.0"; + org.eclipse.emf.internal.cdo.session;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.session.remote;version="3.1.0"; + org.eclipse.emf.internal.cdo.session.remote;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.transaction;version="3.1.0"; + org.eclipse.emf.internal.cdo.transaction;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.util;version="3.1.0"; + org.eclipse.emf.internal.cdo.util;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.view;version="3.1.0"; + org.eclipse.emf.internal.cdo.view;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.spi.cdo;version="3.1.0" + org.eclipse.emf.spi.cdo;version="4.0.0" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java index 6f056bad0e..2fc093a3a1 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java @@ -197,7 +197,7 @@ public interface CDOSession extends CDOCommonSession, CDOUpdatable, IContainer<C public CDOView[] getViews(); /** - * @since 3.1 + * @since 4.0 */ public CDOView getView(int viewID); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.java index a64abc6ba0..32c698ab23 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.java @@ -23,7 +23,7 @@ import java.util.Map; /** * @author Eike Stepper - * @since 3.1 + * @since 4.0 */ public interface CDOConflictResolver2 extends CDOConflictResolver { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java index 977d2c5f16..dc37690940 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java @@ -339,7 +339,7 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction } /** - * @since 3.1 + * @since 4.0 */ public CDOChangeSetData getChangeSetData() { @@ -519,12 +519,6 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction delegate.removeTransactionHandler(handler); } - @Deprecated - public void resolveConflicts(CDOConflictResolver... resolver) - { - delegate.resolveConflicts(resolver); - } - public CDOChangeSetData merge(CDOBranchPoint source, CDOMerger merger) { return delegate.merge(source, merger); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOSavepoint.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOSavepoint.java index d62d013278..25e9bc11ec 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOSavepoint.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOSavepoint.java @@ -105,7 +105,7 @@ public interface CDOSavepoint extends CDOUserSavepoint, CDOChangeSetDataProvider public Map<CDOID, CDORevisionDelta> getAllRevisionDeltas(); /** - * @since 3.1 + * @since 4.0 */ public CDOChangeSetData getAllChangeSetData(); } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java index 61dea7a9a7..7abc20d213 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java @@ -60,9 +60,6 @@ public interface CDOTransaction extends CDOView, CDOUserTransaction, CDOChangeSe public Set<CDOObject> getConflicts(); - @Deprecated - public void resolveConflicts(CDOConflictResolver... resolver); - /** * @since 3.0 */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java index 194919e8d9..e20c6a0b47 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewInvalidationEvent.java @@ -48,7 +48,7 @@ public interface CDOViewInvalidationEvent extends CDOViewEvent * Returns a map with the {@link CDORevisionDelta change deltas} per object. Note that this map may contain object/ * <code>null</code> mappings, if the delta is not available! * - * @since 3.1 + * @since 4.0 */ public Map<CDOObject, CDORevisionDelta> getRevisionDeltas(); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectReferenceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectReferenceImpl.java index 2e73c2818e..fc0e5dc5e8 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectReferenceImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectReferenceImpl.java @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference; /** * @author Eike Stepper - * @since 3.1 + * @since 4.0 */ public class CDOObjectReferenceImpl implements CDOObjectReference { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java index f8da93505e..bcde199751 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java @@ -123,8 +123,8 @@ public final class CDOStore implements EStore } InternalCDORevision revision = getRevisionForReading(cdoObject); - return (InternalEObject)convertIdToObject(cdoObject.cdoView(), cdoObject, EcorePackage.eINSTANCE - .eContainingFeature(), -1, revision.getContainerID()); + return (InternalEObject)convertIdToObject(cdoObject.cdoView(), cdoObject, + EcorePackage.eINSTANCE.eContainingFeature(), -1, revision.getContainerID()); } public int getContainingFeatureID(InternalEObject eObject) @@ -151,11 +151,10 @@ public final class CDOStore implements EStore } InternalCDORevision revision = getRevisionForReading(cdoObject); - return (InternalEObject)convertIdToObject(cdoObject.cdoView(), cdoObject, EcorePackage.eINSTANCE - .eContainingFeature(), -1, revision.getResourceID()); + return (InternalEObject)convertIdToObject(cdoObject.cdoView(), cdoObject, + EcorePackage.eINSTANCE.eContainingFeature(), -1, revision.getResourceID()); } - @Deprecated public EStructuralFeature getContainingFeature(InternalEObject eObject) { throw new UnsupportedOperationException("Use getContainingFeatureID() instead"); //$NON-NLS-1$ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java index 0142b79d57..8cfe3683ed 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java @@ -99,6 +99,7 @@ import org.eclipse.net4j.util.options.IOptionsContainer; import org.eclipse.net4j.util.options.OptionsEvent; import org.eclipse.emf.common.util.ECollections; +import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -1535,14 +1536,14 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter } public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment, - CDOCommitData commitData, OMMonitor monitor) + CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, OMMonitor monitor) { int attempt = 0; for (;;) { try { - return delegate.commitDelegation(branch, userID, comment, commitData, monitor); + return delegate.commitDelegation(branch, userID, comment, commitData, detachedObjectTypes, monitor); } catch (Exception ex) { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java index bb3c324491..b778fcedee 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java @@ -303,21 +303,6 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa return conflicts; } - /** - * @since 2.0 - */ - @Deprecated - public void resolveConflicts(CDOConflictResolver... resolvers) - { - throw new UnsupportedOperationException(); - } - - @Deprecated - public void handleConflicts(Set<CDOObject> conflicts) - { - throw new UnsupportedOperationException(); - } - public CDOChangeSetData getChangeSetData() { checkActive(); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.java index b68207aa9a..33f57a8949 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.java @@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransactionHandler; /** * @author Eike Stepper - * @since 3.1 + * @since 4.0 */ public abstract class AbstractChangeSetsConflictResolver extends AbstractConflictResolver { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractConflictResolver.java index 32ac127da9..c8c5268804 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractConflictResolver.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractConflictResolver.java @@ -13,11 +13,9 @@ package org.eclipse.emf.spi.cdo; import org.eclipse.emf.cdo.transaction.CDOConflictResolver; import org.eclipse.emf.cdo.transaction.CDOTransaction; - - /** * @author Eike Stepper - * @since 3.1 + * @since 4.0 */ public abstract class AbstractConflictResolver implements CDOConflictResolver { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java index 0c297e8ade..ab7babea79 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.emf.spi.cdo; -import org.eclipse.emf.cdo.CDODeltaNotification; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.common.id.CDOID; @@ -40,8 +39,6 @@ import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; @@ -83,7 +80,7 @@ public abstract class AbstractObjectConflictResolver extends AbstractConflictRes } /** - * @since 3.1 + * @since 4.0 */ public void resolveConflicts(Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> allRemoteDeltas) @@ -104,7 +101,7 @@ public abstract class AbstractObjectConflictResolver extends AbstractConflictRes * conflict, it may be necessary to adjust the notification that will be sent to the adapters in the current * transaction. This can be achieved by adjusting the {@link CDORevisionDelta} in <code>deltas</code>. * - * @since 3.1 + * @since 4.0 */ protected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta, CDORevisionDelta remoteDelta, List<CDORevisionDelta> allRemoteDeltas) @@ -254,92 +251,7 @@ public abstract class AbstractObjectConflictResolver extends AbstractConflictRes /** * @author Eike Stepper - * @since 2.0 - */ - @Deprecated - public static class ChangeSubscriptionAdapter extends AdapterImpl - { - private Set<CDOObject> notifiers = new HashSet<CDOObject>(); - - private Map<CDOObject, List<CDORevisionDelta>> deltas = new HashMap<CDOObject, List<CDORevisionDelta>>(); - - public ChangeSubscriptionAdapter() - { - } - - public List<CDORevisionDelta> getRevisionDeltas(CDOObject notifier) - { - List<CDORevisionDelta> list = deltas.get(CDOUtil.getEObject(notifier)); - if (list == null) - { - return Collections.emptyList(); - } - - return list; - } - - public Set<CDOObject> getNotifiers() - { - return notifiers; - } - - public Map<CDOObject, List<CDORevisionDelta>> getDeltas() - { - return deltas; - } - - public void attach(CDOObject notifier) - { - if (notifiers.add(notifier)) - { - notifier.eAdapters().add(this); - } - } - - public void reset() - { - for (CDOObject notifier : notifiers) - { - notifier.eAdapters().remove(this); - } - - notifiers.clear(); - deltas.clear(); - } - - @Override - public void notifyChanged(Notification msg) - { - try - { - if (msg instanceof CDODeltaNotification) - { - CDODeltaNotification deltaNotification = (CDODeltaNotification)msg; - Object notifier = deltaNotification.getNotifier(); - if (!deltaNotification.hasNext() && notifiers.contains(notifier)) - { - CDORevisionDelta revisionDelta = deltaNotification.getRevisionDelta(); - List<CDORevisionDelta> list = deltas.get(notifier); - if (list == null) - { - list = new ArrayList<CDORevisionDelta>(1); - deltas.put(CDOUtil.getCDOObject((EObject)notifier), list); - } - - list.add(revisionDelta); - } - } - } - catch (Exception ex) - { - OM.LOG.error(ex); - } - } - } - - /** - * @author Eike Stepper - * @since 3.1 + * @since 4.0 */ public static class RevisionDeltaCollector implements IListener { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOChangeSubscriptionAdapter.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOChangeSubscriptionAdapter.java index 4cd6f7dcec..55913c119f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOChangeSubscriptionAdapter.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOChangeSubscriptionAdapter.java @@ -13,7 +13,7 @@ import java.util.Set; /** * @author Eike Stepper - * @since 3.1 + * @since 4.0 */ public class CDOChangeSubscriptionAdapter extends AdapterImpl { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java index 00797390cd..87e64e7ade 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.java @@ -19,7 +19,7 @@ import java.util.Set; /** * @author Eike Stepper - * @since 3.1 + * @since 4.0 */ public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolver { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java index 32569de781..4005769f81 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.java @@ -21,7 +21,7 @@ import org.eclipse.net4j.util.event.IListener; /** * @author Eike Stepper - * @since 3.1 + * @since 4.0 */ public class CDOSessionInvalidationAggregator { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java index 057590a364..e52fddd892 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java @@ -43,6 +43,7 @@ import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType; import org.eclipse.net4j.util.om.monitor.OMMonitor; +import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.spi.cdo.InternalCDOXATransaction.InternalCDOXACommitContext; @@ -139,10 +140,10 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo CDOIDProvider idProvider, CDOCommitData commitData, OMMonitor monitor); /** - * @since 3.0 + * @since 4.0 */ public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment, - CDOCommitData commitData, OMMonitor monitor); + CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, OMMonitor monitor); /** * @since 3.0 @@ -235,7 +236,7 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo private List<InternalCDOPackageUnit> packageUnits = new ArrayList<InternalCDOPackageUnit>(); /** - * @since 3.1 + * @since 4.0 */ public OpenSessionResult(int sessionID, String userID, String repositoryUUID, CDOCommonRepository.Type repositoryType, CDOCommonRepository.State repositoryState, String storeType, @@ -335,7 +336,7 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo } /** - * @since 3.1 + * @since 4.0 */ public boolean isRepositoryEnsuringReferentialIntegrity() { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java index b107bd691e..4be5a9706c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java @@ -11,7 +11,6 @@ */ package org.eclipse.emf.spi.cdo; -import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.common.commit.CDOChangeSetData; import org.eclipse.emf.cdo.common.commit.CDOCommitData; import org.eclipse.emf.cdo.common.id.CDOID; @@ -29,7 +28,6 @@ import org.eclipse.emf.spi.cdo.CDOSessionProtocol.CommitTransactionResult; import java.util.List; import java.util.Map; -import java.util.Set; /** * @author Simon McDuff @@ -83,9 +81,6 @@ public interface InternalCDOTransaction extends CDOTransaction, InternalCDOUserT public void setConflict(InternalCDOObject object); - @Deprecated - public void handleConflicts(Set<CDOObject> conflicts); - /** * @since 3.0 */ diff --git a/plugins/org.gastro.business.edit/META-INF/MANIFEST.MF b/plugins/org.gastro.business.edit/META-INF/MANIFEST.MF index d2d777d587..00eedcb5b9 100644 --- a/plugins/org.gastro.business.edit/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.business.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.business.edit;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.gastro.business.provider.BusinessEditPlugin$Implementation Bundle-Vendor: %providerName @@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.gastro.business.provider;version="3.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.gastro.business;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.gastro.inventory;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.gastro.inventory.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.gastro.business;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.inventory;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.inventory.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.gastro.business/META-INF/MANIFEST.MF b/plugins/org.gastro.business/META-INF/MANIFEST.MF index 692f340a07..cb980d4948 100644 --- a/plugins/org.gastro.business/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.business/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.business;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.gastro.business;version="3.0.0", - org.gastro.business.impl;version="3.0.0", - org.gastro.business.util;version="3.0.0" +Export-Package: org.gastro.business;version="4.0.0", + org.gastro.business.impl;version="4.0.0", + org.gastro.business.util;version="4.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)", - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.gastro.inventory;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.inventory;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF b/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF index 1c48c3af1c..a839d58331 100644 --- a/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.inventory.edit;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.gastro.inventory.provider.InventoryEditPlugin$Implementation Bundle-Vendor: %providerName @@ -10,6 +10,6 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.gastro.inventory.provider;version="3.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.emf.cdo.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.gastro.inventory;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.inventory;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.gastro.inventory/META-INF/MANIFEST.MF b/plugins/org.gastro.inventory/META-INF/MANIFEST.MF index febfba3f4f..b98521bd0b 100644 --- a/plugins/org.gastro.inventory/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.inventory/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.gastro.inventory;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.gastro.inventory;version="3.0.0", - org.gastro.inventory.impl;version="3.0.0", - org.gastro.inventory.util;version="3.0.0" +Export-Package: org.gastro.inventory;version="4.0.0", + org.gastro.inventory.impl;version="4.0.0", + org.gastro.inventory.util;version="4.0.0" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF index 838bbd4d97..584efb7116 100644 --- a/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDO Gastro Example RCP Department Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.gastro.rcp.internal.department.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: Eclipse Modeling Project -Require-Bundle: org.gastro.rcp;bundle-version="[3.0.0,4.0.0)";visibility:=reexport +Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Export-Package: com.swtdesigner;version="3.0.0";x-internal:=true, - org.gastro.rcp.internal.department;version="3.0.0";x-internal:=true + org.gastro.rcp.internal.department;version="4.0.0";x-internal:=true diff --git a/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF index 342dc8eb1f..12c12cdcf1 100644 --- a/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDO Gastro Example RCP Table Bundle-SymbolicName: org.gastro.rcp.table; singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.gastro.rcp.internal.table.Activator -Require-Bundle: org.gastro.rcp;bundle-version="[3.0.0,4.0.0)";visibility:=reexport +Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: Eclipse Modeling Project -Export-Package: com.swtdesigner;version="3.0.0";x-internal:=true, - org.gastro.rcp.internal.table;version="3.0.0";x-internal:=true +Export-Package: com.swtdesigner;version="4.0.0";x-internal:=true, + org.gastro.rcp.internal.table;version="4.0.0";x-internal:=true diff --git a/plugins/org.gastro.rcp/.settings/.api_filters b/plugins/org.gastro.rcp/.settings/.api_filters deleted file mode 100644 index bbe43b1a35..0000000000 --- a/plugins/org.gastro.rcp/.settings/.api_filters +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.gastro.rcp" version="2"> - <resource path="META-INF/MANIFEST.MF"> - <filter id="924844039"> - <message_arguments> - <message_argument value="3.0.100.qualifier"/> - <message_argument value="3.0.0.v20100614-1656"/> - </message_arguments> - </filter> - </resource> -</component> diff --git a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF index 22a7c39fe8..9205ad6143 100644 --- a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDO Gastro Example RCP Bundle-SymbolicName: org.gastro.rcp; singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.gastro.internal.rcp.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.tcp;bundle-version="[2.0.0,4.0.0)";visibility:=reexport, org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.emf.edit.ui;bundle-version="2.5.0";visibility:=reexport, - org.gastro.business;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.gastro.business.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.gastro.inventory;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.gastro.inventory.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.gastro.business;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.business.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.inventory;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.gastro.inventory.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.nebula.animation;version="0.5.2", @@ -21,8 +21,8 @@ Export-Package: org.eclipse.nebula.animation;version="0.5.2", org.eclipse.nebula.jface.galleryviewer;version="0.5.2", org.eclipse.nebula.widgets.gallery;version="0.5.2", org.eclipse.nebula.widgets.pshelf;version="1.0.0", - org.gastro.internal.rcp;version="3.0.100";x-internal:=true, - org.gastro.rcp;version="3.0.100" + org.gastro.internal.rcp;version="4.0.0";x-internal:=true, + org.gastro.rcp;version="4.0.0" Bundle-ClassPath: ., org.eclipse.nebula.widgets.pshelf_1.0.0.HEAD.jar, org.eclipse.nebula.widgets.gallery_0.5.2.R_0_20090418.jar diff --git a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF index d9c0565470..380d6a292b 100644 --- a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDO Gastro Example Server Web Support Bundle-SymbolicName: org.gastro.server.web;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-Activator: org.gastro.server.internal.web.OM$Activator Bundle-Vendor: Eclipse Modeling Project Require-Bundle: org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)", @@ -10,7 +10,7 @@ Require-Bundle: org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)", org.eclipse.equinox.http.registry;bundle-version="[1.0.0,2.0.0)", org.eclipse.equinox.http.servlet;bundle-version="[1.0.0,2.0.0)", org.eclipse.equinox.http.jetty;bundle-version="[2.0.0,4.0.0)", - org.eclipse.emf.cdo.net4j;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.jvm;bundle-version="[2.0.0,4.0.0)", org.gastro.server;bundle-version="1.0.0", org.gastro.business;bundle-version="1.0.0", @@ -21,5 +21,5 @@ Import-Package: javax.servlet;version="[2.3.0,3.0.0)", org.apache.commons.lang;version="[2.3.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Export-Package: org.gastro.server.internal.web;version="3.0.0";x-internal:=true, - templates;version="3.0.0";x-internal:=true +Export-Package: org.gastro.server.internal.web;version="3.0.100";x-internal:=true, + templates;version="3.0.100";x-internal:=true diff --git a/plugins/org.gastro.testclient/META-INF/MANIFEST.MF b/plugins/org.gastro.testclient/META-INF/MANIFEST.MF index 66a7a7f4fe..bdeabdee49 100644 --- a/plugins/org.gastro.testclient/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.testclient/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDO Gastro Example Test Client Bundle-SymbolicName: org.gastro.testclient -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.net4j.tcp;bundle-version="[2.0.0,4.0.0)", - org.eclipse.emf.cdo.net4j;bundle-version="[2.0.0,4.0.0)";resolution:=optional, - org.eclipse.emf.cdo.ui;bundle-version="[2.0.0,4.0.0)", + org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";resolution:=optional, + org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", org.gastro.business;bundle-version="1.0.0", org.gastro.business.edit;bundle-version="1.0.0", org.gastro.inventory;bundle-version="1.0.0", |