From 6c8f8258d5ff103a8c85e8fa83ed9e37aed042c2 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Tue, 5 Jun 2007 19:46:41 +0000 Subject: [PATCH] [189269] Add version range specifiers with all plugin dependencies. Make features require plugins. Avoid Discovery require RSE. --- .../META-INF/MANIFEST.MF | 8 ++++---- .../feature.xml | 8 ++++---- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 13 ++++-------- .../META-INF/MANIFEST.MF | 6 +++--- .../org.eclipse.rse.build/maps/discovery.map | 14 ++++++------- releng/org.eclipse.rse.build/maps/rse.map | 2 +- .../org.eclipse.rse.build/maps/terminal.map | 6 +++--- .../META-INF/MANIFEST.MF | 12 +++++------ .../feature.xml | 20 +++++++++++++++---- .../META-INF/MANIFEST.MF | 12 +++++------ .../feature.xml | 5 ++--- .../feature.xml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../feature.xml | 8 ++++---- .../META-INF/MANIFEST.MF | 4 ++-- .../feature.xml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../feature.xml | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- 23 files changed, 81 insertions(+), 75 deletions(-) diff --git a/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF b/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF index cfa4c846ea6..cee9214b6ad 100644 --- a/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF @@ -7,11 +7,11 @@ Bundle-Activator: org.eclipse.rse.internal.discovery.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.rse.ui, - org.eclipse.rse.core, + org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)", - org.eclipse.tm.discovery.wizard, - org.eclipse.tm.discovery.model + org.eclipse.tm.discovery.wizard;bundle-version="[2.0.0,3.0.0)", + org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)" Eclipse-LazyStart: true Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.xml b/discovery/org.eclipse.tm.discovery-feature/feature.xml index cb6bb71ff37..bf9b7c10853 100644 --- a/discovery/org.eclipse.tm.discovery-feature/feature.xml +++ b/discovery/org.eclipse.tm.discovery-feature/feature.xml @@ -27,18 +27,18 @@ - - + - - diff --git a/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF index 70d76ca4dbf..ec0e48afb87 100644 --- a/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-Activator: org.eclipse.tm.internal.discovery.engine.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.emf.ecore.xmi, - org.eclipse.tm.discovery.model + org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)", + org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)" Eclipse-LazyStart: true Export-Package: org.eclipse.tm.discovery.protocol, org.eclipse.tm.discovery.transport, diff --git a/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF index aed5988ba07..66962c7afdc 100644 --- a/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.model.edit/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.tm.internal.discovery.model.provider;x-friends:="org.eclipse.tm.discovery.view,org.eclipse.tm.discovery.wizard" Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.edit;visibility:=reexport, - org.eclipse.tm.discovery.model + org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)";visibility:=reexport, + org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF index c0051ac70be..7eb9a4ded2b 100644 --- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.tm.discovery.engine, - org.eclipse.tm.discovery.model, + org.eclipse.tm.discovery.engine;bundle-version="[2.0.0,3.0.0)", + org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF index 7acf09e7a6f..31365995f18 100644 --- a/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.tm.discovery.engine + org.eclipse.tm.discovery.engine;bundle-version="[2.0.0,3.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4 Export-Package: org.eclipse.tm.internal.discovery.transport.udp;x-internal:=true diff --git a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF index c64722d7879..4a74752f7e5 100644 --- a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF @@ -7,19 +7,14 @@ Bundle-Activator: org.eclipse.tm.internal.discovery.view.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.forms, - org.eclipse.tm.discovery.engine, - org.eclipse.tm.discovery.model, - org.eclipse.tm.discovery.model.edit, + org.eclipse.tm.discovery.engine;bundle-version="[2.0.0,3.0.0)", + org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)", + org.eclipse.tm.discovery.model.edit;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.resources, org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)", - org.eclipse.tm.discovery.wizard, + org.eclipse.tm.discovery.wizard;bundle-version="[2.0.0,3.0.0)", org.eclipse.ui.ide Eclipse-LazyStart: false -Import-Package: org.eclipse.emf.common.ui, - org.eclipse.emf.common.util, - org.eclipse.tm.internal.discovery.engine, - org.eclipse.tm.internal.discovery.model.provider, - org.eclipse.tm.internal.discovery.model.util Export-Package: org.eclipse.tm.internal.discovery.view;x-internal:=true Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF index 0e2b8fb2763..3287984bc5e 100644 --- a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF +++ b/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF @@ -9,9 +9,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)", org.eclipse.core.runtime, - org.eclipse.tm.discovery.engine, - org.eclipse.tm.discovery.model, - org.eclipse.tm.discovery.model.edit + org.eclipse.tm.discovery.engine;bundle-version="[2.0.0,3.0.0)", + org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)", + org.eclipse.tm.discovery.model.edit;bundle-version="[2.0.0,3.0.0)" Eclipse-LazyStart: true Export-Package: org.eclipse.tm.internal.discovery.wizard;x-friends:="org.eclipse.rse.discovery,org.eclipse.tm.discovery.view" Bundle-Vendor: %providerName diff --git a/releng/org.eclipse.rse.build/maps/discovery.map b/releng/org.eclipse.rse.build/maps/discovery.map index ed2cd3214b1..b91cddef7a6 100644 --- a/releng/org.eclipse.rse.build/maps/discovery.map +++ b/releng/org.eclipse.rse.build/maps/discovery.map @@ -1,9 +1,9 @@ feature@org.eclipse.tm.discovery=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature -plugin@org.eclipse.rse.discovery=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery -plugin@org.eclipse.tm.discovery.engine=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine +plugin@org.eclipse.rse.discovery=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery +plugin@org.eclipse.tm.discovery.engine=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine plugin@org.eclipse.tm.discovery.model=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model -plugin@org.eclipse.tm.discovery.model.edit=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit -plugin@org.eclipse.tm.discovery.protocol.dnssd=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd -plugin@org.eclipse.tm.discovery.transport.udp=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp -plugin@org.eclipse.tm.discovery.view=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view -plugin@org.eclipse.tm.discovery.wizard=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard \ No newline at end of file +plugin@org.eclipse.tm.discovery.model.edit=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit +plugin@org.eclipse.tm.discovery.protocol.dnssd=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd +plugin@org.eclipse.tm.discovery.transport.udp=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp +plugin@org.eclipse.tm.discovery.view=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view +plugin@org.eclipse.tm.discovery.wizard=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard \ No newline at end of file diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map index cd9a3ea440b..cdc9f20a35a 100644 --- a/releng/org.eclipse.rse.build/maps/rse.map +++ b/releng/org.eclipse.rse.build/maps/rse.map @@ -28,7 +28,7 @@ plugin@org.eclipse.rse.examples.tutorial=v20070605,:pserver:anonymous:none@dev.e plugin@org.eclipse.rse.files.ui=v20070605a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui plugin@org.eclipse.rse.importexport=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport plugin@org.eclipse.rse.processes.ui=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui -plugin@org.eclipse.rse.remotecdt=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.remotecdt +plugin@org.eclipse.rse.remotecdt=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.remotecdt plugin@org.eclipse.rse.sdk=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk plugin@org.eclipse.rse.services.dstore=v20070605a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore plugin@org.eclipse.rse.services.files.ftp=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map index a8dcb214f13..81be951f36f 100644 --- a/releng/org.eclipse.rse.build/maps/terminal.map +++ b/releng/org.eclipse.rse.build/maps/terminal.map @@ -5,7 +5,7 @@ feature@org.eclipse.tm.terminal.ssh=v20070605,:pserver:anonymous:none@dev.eclips feature@org.eclipse.tm.terminal.telnet=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet-feature feature@org.eclipse.tm.terminal.view=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature plugin@org.eclipse.tm.terminal=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal -plugin@org.eclipse.tm.terminal.serial=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial -plugin@org.eclipse.tm.terminal.ssh=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh +plugin@org.eclipse.tm.terminal.serial=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial +plugin@org.eclipse.tm.terminal.ssh=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh plugin@org.eclipse.tm.terminal.telnet=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet -plugin@org.eclipse.tm.terminal.view=v20070530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view \ No newline at end of file +plugin@org.eclipse.tm.terminal.view=v20070605,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view \ No newline at end of file diff --git a/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF index abf202585dc..4184f9930a6 100644 --- a/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF +++ b/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: org.eclipse.rse.remotecdt;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.eclipse.rse.internal.remotecdt.Activator Bundle-Localization: plugin -Require-Bundle: org.eclipse.rse.ui, - org.eclipse.rse.subsystems.shells.core, - org.eclipse.rse.subsystems.files.core, - org.eclipse.rse.core, - org.eclipse.rse.services, +Require-Bundle: org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)", org.eclipse.cdt.launch, org.eclipse.cdt.debug.mi.core, org.eclipse.cdt.debug.core, @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.rse.ui, org.eclipse.core.runtime, org.eclipse.cdt.debug.mi.ui, org.eclipse.cdt.debug.ui, - org.eclipse.rse.files.ui + org.eclipse.rse.files.ui;bundle-version="[2.0.0,3.0.0)" Eclipse-LazyStart: true Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml index 0ec8db1a7a2..2cc8a1a33a5 100644 --- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml +++ b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml @@ -25,10 +25,22 @@ - - - - + + + + + + + + + + + + + + + + + version="1.0.0.qualifier" + provider-name="%providerName"> %description @@ -25,7 +25,6 @@ - + version="1.0.0.qualifier" + provider-name="%providerName"> %description @@ -28,7 +28,7 @@ - + + version="1.0.0.qualifier" + provider-name="%providerName"> %description @@ -25,9 +25,9 @@ - - + + + version="1.0.0.qualifier" + provider-name="%providerName"> %description @@ -25,7 +25,7 @@ - + + version="1.0.0.qualifier" + provider-name="%providerName"> %description @@ -25,7 +25,7 @@ - +