diff options
47 files changed, 156 insertions, 150 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF index 335178eed..e1cfd6af4 100644 --- a/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.example.clients/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.ecf.example.clients;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %plugin.provider Bundle-Localization: plugin -Export-Package: org.eclipse.ecf.example.clients, - org.eclipse.ecf.example.clients.applications +Export-Package: org.eclipse.ecf.example.clients;version="2.0.0", + org.eclipse.ecf.example.clients.applications;version="2.0.0" Require-Bundle: org.eclipse.ecf, org.eclipse.ecf.presence, org.eclipse.ecf.provider.xmpp, diff --git a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF index b05f568a3..33702d72a 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.example.collab.ClientPlugin Bundle-Vendor: %plugin.provider Bundle-Localization: plugin -Export-Package: org.eclipse.ecf.example.collab.share, - org.eclipse.ecf.example.collab.share.io, - org.eclipse.ecf.example.collab.share.url, +Export-Package: org.eclipse.ecf.example.collab.share;version="2.0.0", + org.eclipse.ecf.example.collab.share.io;version="2.0.0", + org.eclipse.ecf.example.collab.share.url;version="2.0.0", org.eclipse.ecf.internal.example.collab;x-internal:=true, org.eclipse.ecf.internal.example.collab.actions;x-internal:=true, org.eclipse.ecf.internal.example.collab.start;x-internal:=true, diff --git a/examples/bundles/org.eclipse.ecf.examples.loadbalancing/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.loadbalancing/META-INF/MANIFEST.MF index 9b2daa376..02cd74628 100644 --- a/examples/bundles/org.eclipse.ecf.examples.loadbalancing/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.loadbalancing/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.ecf.examples.loadbalancing Bundle-Version: 1.1.0.qualifier Bundle-Vendor: %bundleProvider Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.ecf.examples.loadbalancing +Export-Package: org.eclipse.ecf.examples.loadbalancing;version="1.1.0" Bundle-Localization: bundle Import-Package: org.eclipse.ecf.remoteservice Bundle-ActivationPolicy: lazy diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/META-INF/MANIFEST.MF index ef6872792..734f0f6e3 100644 --- a/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.provider.remoteservice/META-INF/MANIFEST.MF @@ -17,6 +17,6 @@ Import-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.equinox.concurrent.future;version="1.0.0", org.osgi.framework;version="1.6.0" Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0" -Export-Package: org.eclipse.ecf.examples.provider.remoteservice.identity, +Export-Package: org.eclipse.ecf.examples.provider.remoteservice.identity;version="1.0.0", org.eclipse.ecf.internal.examples.provider.remoteservice.container;x-internal:=true Bundle-Localization: plugin diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF index be99f721e..beb52f0c5 100644 --- a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF @@ -11,8 +11,8 @@ Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 -Export-Package: org.eclipse.ecf.examples.provider.trivial, - org.eclipse.ecf.examples.provider.trivial.identity, +Export-Package: org.eclipse.ecf.examples.provider.trivial;version="1.0.0", + org.eclipse.ecf.examples.provider.trivial.identity;version="1.0.0", org.eclipse.ecf.internal.examples.provider.trivial;x-internal:=true, org.eclipse.ecf.internal.examples.provider.trivial.container;x-internal:=true Bundle-Localization: bundle diff --git a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF index d388ceda8..f30296b15 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF @@ -5,10 +5,10 @@ Bundle-SymbolicName: org.eclipse.ecf.datashare;singleton:=true Bundle-Version: 3.0.100.qualifier Bundle-Vendor: %plugin.provider Bundle-Localization: plugin -Export-Package: org.eclipse.ecf.datashare, - org.eclipse.ecf.datashare.events, - org.eclipse.ecf.datashare.mergeable, - org.eclipse.ecf.datashare.service +Export-Package: org.eclipse.ecf.datashare;version="3.1.0", + org.eclipse.ecf.datashare.events;version="3.1.0", + org.eclipse.ecf.datashare.mergeable;version="3.1.0", + org.eclipse.ecf.datashare.service;version="3.1.0" Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, J2SE-1.3 Require-Bundle: org.eclipse.ecf, diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/META-INF/MANIFEST.MF index 0443a2d01..92c3a0eef 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 -Export-Package: org.eclipse.ecf.discovery.ui.model;x-friends:="org.eclipse.ecf.discovery.ui", - org.eclipse.ecf.discovery.ui.model.provider;x-friends:="org.eclipse.ecf.discovery.ui" +Export-Package: org.eclipse.ecf.discovery.ui.model;version="3.0.0";x-friends:="org.eclipse.ecf.discovery.ui", + org.eclipse.ecf.discovery.ui.model.provider;version="3.0.0";x-friends:="org.eclipse.ecf.discovery.ui" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", org.eclipse.ecf.discovery.ui.model;bundle-version="3.0.0", org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)" diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.model/META-INF/MANIFEST.MF index d6b990d9b..e125e31d3 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", org.eclipse.ecf.discovery;bundle-version="2.0.0", org.eclipse.ecf;bundle-version="2.0.0" Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.ecf.discovery.ui.model, - org.eclipse.ecf.discovery.ui.model.impl, - org.eclipse.ecf.discovery.ui.model.util +Export-Package: org.eclipse.ecf.discovery.ui.model;version="3.0.0", + org.eclipse.ecf.discovery.ui.model.impl;version="3.0.0", + org.eclipse.ecf.discovery.ui.model.util;version="3.0.0" Bundle-Activator: org.eclipse.ecf.discovery.ui.model.ModelPlugin diff --git a/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF index 2a1118777..210a60b7b 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF @@ -19,9 +19,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ecf.sync;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: J2SE-1.4 Eclipse-LazyStart: true -Export-Package: org.eclipse.ecf.docshare, - org.eclipse.ecf.docshare.menu, - org.eclipse.ecf.docshare.messages, +Export-Package: org.eclipse.ecf.docshare;version="2.1.0", + org.eclipse.ecf.docshare.menu;version="2.1.0", + org.eclipse.ecf.docshare.messages;version="2.1.0", org.eclipse.ecf.internal.docshare;x-internal:=true Eclipse-BuddyPolicy: global Bundle-ActivationPolicy: lazy diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.filetransfer.ui/META-INF/MANIFEST.MF index 37f2758fe..a0e1659ef 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/META-INF/MANIFEST.MF @@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jface.text Eclipse-LazyStart: true Bundle-Vendor: %providerName -Export-Package: org.eclipse.ecf.filetransfer.ui, - org.eclipse.ecf.filetransfer.ui.actions, +Export-Package: org.eclipse.ecf.filetransfer.ui;version="1.5.0", + org.eclipse.ecf.filetransfer.ui.actions;version="1.5.0", org.eclipse.ecf.internal.filetransfer.ui;x-internal:=true Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF index b36d944b4..d19dbbfce 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF @@ -9,12 +9,12 @@ Eclipse-LazyStart: true Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 -Export-Package: org.eclipse.ecf.filetransfer, - org.eclipse.ecf.filetransfer.events, - org.eclipse.ecf.filetransfer.events.socket;version:="1.0";x-internal:="true", - org.eclipse.ecf.filetransfer.events.socketfactory, - org.eclipse.ecf.filetransfer.identity, - org.eclipse.ecf.filetransfer.service, +Export-Package: org.eclipse.ecf.filetransfer;version="5.0.0", + org.eclipse.ecf.filetransfer.events;version="5.0.0", + org.eclipse.ecf.filetransfer.events.socket;version:="1.0";x-internal:=true, + org.eclipse.ecf.filetransfer.events.socketfactory;version="5.0.0", + org.eclipse.ecf.filetransfer.identity;version="5.0.0", + org.eclipse.ecf.filetransfer.service;version="5.0.0", org.eclipse.ecf.internal.filetransfer;x-internal:=true Require-Bundle: org.eclipse.equinox.common, org.eclipse.equinox.registry, diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence.bot/META-INF/MANIFEST.MF index 2abdddff6..40f60c21f 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence.bot/META-INF/MANIFEST.MF @@ -13,9 +13,9 @@ Require-Bundle: org.eclipse.equinox.common, org.eclipse.ecf.presence Eclipse-LazyStart: true Export-Package: org.eclipse.ecf.internal.presence.bot;x-internal:=true, - org.eclipse.ecf.presence.bot, - org.eclipse.ecf.presence.bot.application, - org.eclipse.ecf.presence.bot.impl + org.eclipse.ecf.presence.bot;version="1.3.0", + org.eclipse.ecf.presence.bot.application;version="1.3.0", + org.eclipse.ecf.presence.bot.impl;version="1.3.0" Import-Package: org.osgi.framework, org.osgi.util.tracker Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence.collab.ui/META-INF/MANIFEST.MF index b488cd436..73a1a67f0 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/META-INF/MANIFEST.MF @@ -18,11 +18,11 @@ Require-Bundle: org.eclipse.ui, Eclipse-LazyStart: true Export-Package: org.eclipse.ecf.internal.presence.collab.ui;x-internal:=true, org.eclipse.ecf.internal.presence.collab.ui.view;x-internal:=true, - org.eclipse.ecf.presence.collab.ui, - org.eclipse.ecf.presence.collab.ui.console, - org.eclipse.ecf.presence.collab.ui.screencapture, - org.eclipse.ecf.presence.collab.ui.url, - org.eclipse.ecf.presence.collab.ui.view + org.eclipse.ecf.presence.collab.ui;version="1.3.0", + org.eclipse.ecf.presence.collab.ui.console;version="1.3.0", + org.eclipse.ecf.presence.collab.ui.screencapture;version="1.3.0", + org.eclipse.ecf.presence.collab.ui.url;version="1.3.0", + org.eclipse.ecf.presence.collab.ui.view;version="1.3.0" Eclipse-BuddyPolicy: global Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence.ui/META-INF/MANIFEST.MF index 984307088..b7439962f 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence.ui/META-INF/MANIFEST.MF @@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.core.runtime, Eclipse-LazyStart: true Export-Package: org.eclipse.ecf.internal.presence.ui;x-internal:=true, org.eclipse.ecf.internal.presence.ui.dialogs;x-internal:=true, - org.eclipse.ecf.presence.ui, - org.eclipse.ecf.presence.ui.chatroom, - org.eclipse.ecf.presence.ui.dnd, - org.eclipse.ecf.presence.ui.menu, - org.eclipse.ecf.presence.ui.roster + org.eclipse.ecf.presence.ui;version="2.2.0", + org.eclipse.ecf.presence.ui.chatroom;version="2.2.0", + org.eclipse.ecf.presence.ui.dnd;version="2.2.0", + org.eclipse.ecf.presence.ui.menu;version="2.2.0", + org.eclipse.ecf.presence.ui.roster;version="2.2.0" Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 Import-Package: org.eclipse.core.expressions, diff --git a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF index 0641304f1..fcaa97cc6 100644 --- a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF @@ -7,14 +7,14 @@ Bundle-Vendor: %plugin.provider Bundle-Localization: plugin Eclipse-LazyStart: true Export-Package: org.eclipse.ecf.internal.presence;x-internal:=true, - org.eclipse.ecf.presence, - org.eclipse.ecf.presence.chatroom, - org.eclipse.ecf.presence.history, - org.eclipse.ecf.presence.im, - org.eclipse.ecf.presence.roster, - org.eclipse.ecf.presence.search, - org.eclipse.ecf.presence.search.message, - org.eclipse.ecf.presence.service + org.eclipse.ecf.presence;version="2.1.0", + org.eclipse.ecf.presence.chatroom;version="2.1.0", + org.eclipse.ecf.presence.history;version="2.1.0", + org.eclipse.ecf.presence.im;version="2.1.0", + org.eclipse.ecf.presence.roster;version="2.1.0", + org.eclipse.ecf.presence.search;version="2.1.0", + org.eclipse.ecf.presence.search.message;version="2.1.0", + org.eclipse.ecf.presence.service;version="2.1.0" Bundle-ManifestVersion: 2 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, J2SE-1.3 diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF index 2f5e6e838..47d89b0fd 100644 --- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF @@ -7,11 +7,11 @@ Bundle-Activator: org.eclipse.ecf.internal.provider.ProviderPlugin Bundle-Localization: plugin Eclipse-LazyStart: true Export-Package: org.eclipse.ecf.internal.provider;x-internal:=true, - org.eclipse.ecf.provider.comm, - org.eclipse.ecf.provider.comm.tcp, - org.eclipse.ecf.provider.generic, - org.eclipse.ecf.provider.generic.gmm, - org.eclipse.ecf.provider.util + org.eclipse.ecf.provider.comm;version="4.3.0", + org.eclipse.ecf.provider.comm.tcp;version="4.3.0", + org.eclipse.ecf.provider.generic;version="4.3.0", + org.eclipse.ecf.provider.generic.gmm;version="4.3.0", + org.eclipse.ecf.provider.util;version="4.3.0" Eclipse-BuddyPolicy: global Bundle-ManifestVersion: 2 Require-Bundle: org.eclipse.equinox.common, diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF index 3ce331d48..da57273c0 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Import-Package: com.sun.syndication.feed;version="0.9.0", Bundle-ActivationPolicy: lazy Require-Bundle: org.jdom;bundle-version="1.0.0", org.eclipse.equinox.common;bundle-version="3.6.0" -Export-Package: org.eclipse.ecf.remoteservice.rest.synd +Export-Package: org.eclipse.ecf.remoteservice.rest.synd;version="1.0.0" Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF index a757d1a2c..d4004550e 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF @@ -10,10 +10,10 @@ Eclipse-BuddyPolicy: global DynamicImport-Package: * Bundle-RequiredExecutionEnvironment: J2SE-1.4 Export-Package: org.eclipse.ecf.internal.remoteservice.rest;x-internal:=true, - org.eclipse.ecf.remoteservice.rest, - org.eclipse.ecf.remoteservice.rest.client, - org.eclipse.ecf.remoteservice.rest.identity, - org.eclipse.ecf.remoteservice.rest.util + org.eclipse.ecf.remoteservice.rest;version="2.2.200", + org.eclipse.ecf.remoteservice.rest.client;version="2.2.200", + org.eclipse.ecf.remoteservice.rest.identity;version="2.2.200", + org.eclipse.ecf.remoteservice.rest.util;version="2.2.200" Import-Package: org.apache.commons.httpclient;version="3.0.1", org.apache.commons.httpclient.auth;version="3.0.1", org.apache.commons.httpclient.methods;version="3.1.0", diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/META-INF/MANIFEST.MF index c82d04e59..97329b18f 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/META-INF/MANIFEST.MF @@ -29,8 +29,8 @@ Import-Package: org.osgi.framework, org.eclipse.ecf.remoteservice.client, org.osgi.service.log;version="1.3.0" Export-Package: org.eclipse.ecf.internal.remoteservice.rpc;x-internal:=true, - org.eclipse.ecf.remoteservice.rpc, - org.eclipse.ecf.remoteservice.rpc.client, - org.eclipse.ecf.remoteservice.rpc.identity + org.eclipse.ecf.remoteservice.rpc;version="1.0.0", + org.eclipse.ecf.remoteservice.rpc.client;version="1.0.0", + org.eclipse.ecf.remoteservice.rpc.identity;version="1.0.0" Bundle-Localization: plugin DynamicImport-Package: * diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.soap/META-INF/MANIFEST.MF index 01f17f611..6686cbbd6 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/META-INF/MANIFEST.MF @@ -11,8 +11,8 @@ Import-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.remoteservice, org.eclipse.ecf.remoteservice.client Bundle-ClassPath: . -Export-Package: org.eclipse.ecf.remoteservice.soap.client, - org.eclipse.ecf.remoteservice.soap.identity +Export-Package: org.eclipse.ecf.remoteservice.soap.client;version="1.0.0", + org.eclipse.ecf.remoteservice.soap.identity;version="1.0.0" DynamicImport-Package: * Eclipse-BuddyPolicy: global Require-Bundle: org.eclipse.equinox.common diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF index 12937d9b2..d9c6fc2ed 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF @@ -6,13 +6,13 @@ Bundle-Activator: org.eclipse.ecf.internal.core.sharedobject.Activator Bundle-Localization: plugin Bundle-Vendor: %plugin.provider Eclipse-LazyStart: true -Export-Package: org.eclipse.ecf.core.sharedobject, - org.eclipse.ecf.core.sharedobject.events, - org.eclipse.ecf.core.sharedobject.provider, - org.eclipse.ecf.core.sharedobject.security, - org.eclipse.ecf.core.sharedobject.util, - org.eclipse.ecf.core.util.reflection, - org.eclipse.ecf.internal.core.sharedobject;x-internal:=true +Export-Package: org.eclipse.ecf.core.sharedobject;version="2.2.100", + org.eclipse.ecf.core.sharedobject.events;version="2.2.100", + org.eclipse.ecf.core.sharedobject.provider;version="2.2.100", + org.eclipse.ecf.core.sharedobject.security;version="2.2.100", + org.eclipse.ecf.core.sharedobject.util;version="2.2.100", + org.eclipse.ecf.core.util.reflection;version="2.2.100", + org.eclipse.ecf.internal.core.sharedobject;version="2.2.100";x-internal:=true Bundle-ManifestVersion: 2 Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.3 diff --git a/framework/bundles/org.eclipse.ecf.storage/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.storage/META-INF/MANIFEST.MF index 593cea2a6..b6e25f8d0 100644 --- a/framework/bundles/org.eclipse.ecf.storage/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.storage/META-INF/MANIFEST.MF @@ -16,4 +16,4 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.equinox.common, org.eclipse.ecf;bundle-version="2.0.0" Bundle-Localization: plugin -Export-Package: org.eclipse.ecf.storage +Export-Package: org.eclipse.ecf.storage;version="2.0.0" diff --git a/framework/bundles/org.eclipse.ecf.sync/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.sync/META-INF/MANIFEST.MF index 7e7e5de01..3b53dd4a0 100644 --- a/framework/bundles/org.eclipse.ecf.sync/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.sync/META-INF/MANIFEST.MF @@ -18,8 +18,8 @@ Import-Package: org.eclipse.core.runtime, Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.ecf.internal.sync;x-internal:=true, - org.eclipse.ecf.internal.sync.doc.cola;x-internal:=true, - org.eclipse.ecf.internal.sync.doc.identity;x-internal:=true, - org.eclipse.ecf.sync, - org.eclipse.ecf.sync.doc +Export-Package: org.eclipse.ecf.internal.sync;version="2.0.0";x-internal:=true, + org.eclipse.ecf.internal.sync.doc.cola;version="2.0.0";x-internal:=true, + org.eclipse.ecf.internal.sync.doc.identity;version="2.0.0";x-internal:=true, + org.eclipse.ecf.sync;version="2.0.0", + org.eclipse.ecf.sync.doc;version="2.0.0" diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.telephony.call.ui/META-INF/MANIFEST.MF index 38054f549..d503a7533 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/META-INF/MANIFEST.MF @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.ecf, org.eclipse.ecf.telephony.call -Export-Package: org.eclipse.ecf.internal.telephony.call.ui;x-internal:=true, - org.eclipse.ecf.telephony.call.ui.actions +Export-Package: org.eclipse.ecf.internal.telephony.call.ui;version="1.3.0";x-internal:=true, + org.eclipse.ecf.telephony.call.ui.actions;version="1.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, J2SE-1.3 diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.telephony.call/META-INF/MANIFEST.MF index 186d2968a..764261ab9 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.telephony.call/META-INF/MANIFEST.MF @@ -12,9 +12,9 @@ Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, Require-Bundle: org.eclipse.equinox.common, org.eclipse.ecf Import-Package: org.osgi.framework;version="1.3.0" -Export-Package: org.eclipse.ecf.internal.telephony.call;x-internal:=true, - org.eclipse.ecf.telephony.call, - org.eclipse.ecf.telephony.call.dtmf, - org.eclipse.ecf.telephony.call.events, - org.eclipse.ecf.telephony.call.service +Export-Package: org.eclipse.ecf.internal.telephony.call;version="2.0.0";x-internal:=true, + org.eclipse.ecf.telephony.call;version="2.0.0", + org.eclipse.ecf.telephony.call.dtmf;version="2.0.0", + org.eclipse.ecf.telephony.call.events;version="2.0.0", + org.eclipse.ecf.telephony.call.service;version="2.0.0" Bundle-ActivationPolicy: lazy diff --git a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF index a82c803f5..d5255265f 100644 --- a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF @@ -7,17 +7,17 @@ Bundle-Vendor: %plugin.provider Bundle-Localization: plugin Bundle-ManifestVersion: 2 Eclipse-LazyStart: true -Export-Package: org.eclipse.ecf.internal.ui;x-internal:=true, - org.eclipse.ecf.internal.ui.actions;x-internal:=true, - org.eclipse.ecf.internal.ui.perspectives;x-internal:=true, - org.eclipse.ecf.internal.ui.wizards;x-internal:=true, - org.eclipse.ecf.ui, - org.eclipse.ecf.ui.actions, - org.eclipse.ecf.ui.dialogs, - org.eclipse.ecf.ui.hyperlink, - org.eclipse.ecf.ui.screencapture, - org.eclipse.ecf.ui.util, - org.eclipse.ecf.ui.wizards +Export-Package: org.eclipse.ecf.internal.ui;version="2.1.0";x-internal:=true, + org.eclipse.ecf.internal.ui.actions;version="2.1.0";x-internal:=true, + org.eclipse.ecf.internal.ui.perspectives;version="2.1.0";x-internal:=true, + org.eclipse.ecf.internal.ui.wizards;version="2.1.0";x-internal:=true, + org.eclipse.ecf.ui;version="2.1.0", + org.eclipse.ecf.ui.actions;version="2.1.0", + org.eclipse.ecf.ui.dialogs;version="2.1.0", + org.eclipse.ecf.ui.hyperlink;version="2.1.0", + org.eclipse.ecf.ui.screencapture;version="2.1.0", + org.eclipse.ecf.ui.util;version="2.1.0", + org.eclipse.ecf.ui.wizards;version="2.1.0" Eclipse-RegisterBuddy: org.eclipse.ecf Eclipse-BuddyPolicy: dependent Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF index c7dd756c8..3b3c1eba9 100644 --- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF @@ -10,14 +10,14 @@ Bundle-ManifestVersion: 2 Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 Export-Package: org.eclipse.ecf.core;version="3.0.0", - org.eclipse.ecf.core.events, + org.eclipse.ecf.core.events;version="3.1.0", org.eclipse.ecf.core.jobs;version="1.0";x-internal:=true, - org.eclipse.ecf.core.provider, - org.eclipse.ecf.core.security, - org.eclipse.ecf.core.start, + org.eclipse.ecf.core.provider;version="3.1.0", + org.eclipse.ecf.core.security;version="3.1.0", + org.eclipse.ecf.core.start;version="3.1.0", org.eclipse.ecf.core.status;version="1.0";x-internal:=true, - org.eclipse.ecf.core.user, - org.eclipse.ecf.core.util, + org.eclipse.ecf.core.user;version="3.1.0", + org.eclipse.ecf.core.util;version="3.1.0", org.eclipse.ecf.internal.core;x-internal:=true Import-Package: org.eclipse.core.runtime.jobs, org.eclipse.equinox.concurrent.future;version="1.0.0";resolution:=optional;x-installation:=greedy, diff --git a/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/META-INF/MANIFEST.MF b/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/META-INF/MANIFEST.MF index 1763049a2..580826703 100644 --- a/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/META-INF/MANIFEST.MF +++ b/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.protocol.bittorrent Bundle-Version: 0.3.0.qualifier Bundle-Localization: plugin -Export-Package: org.eclipse.ecf.protocol.bittorrent, +Export-Package: org.eclipse.ecf.protocol.bittorrent;version="1.0.0", org.eclipse.ecf.protocol.bittorrent.internal.encode;x-internal:=true, org.eclipse.ecf.protocol.bittorrent.internal.net;x-internal:=true, org.eclipse.ecf.protocol.bittorrent.internal.torrent;x-internal:=true diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/META-INF/MANIFEST.MF b/protocols/bundles/org.eclipse.ecf.protocol.msn/META-INF/MANIFEST.MF index f60113a3f..679123e08 100644 --- a/protocols/bundles/org.eclipse.ecf.protocol.msn/META-INF/MANIFEST.MF +++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-Version: 1.2.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.3 -Export-Package: org.eclipse.ecf.protocol.msn, - org.eclipse.ecf.protocol.msn.events, +Export-Package: org.eclipse.ecf.protocol.msn;version="1.2.0", + org.eclipse.ecf.protocol.msn.events;version="1.2.0", org.eclipse.ecf.protocol.msn.internal.encode;x-internal:=true, org.eclipse.ecf.protocol.msn.internal.net;x-internal:=true Bundle-Vendor: %providerName diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare.nio/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.datashare.nio/META-INF/MANIFEST.MF index 22fbb8db5..a04243023 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare.nio/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.datashare.nio/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 0.9.100.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-Vendor: %plugin.provider Bundle-Localization: plugin -Export-Package: org.eclipse.ecf.provider.datashare.nio;x-friends:="org.eclipse.ecf.provider.irc" +Export-Package: org.eclipse.ecf.provider.datashare.nio;version="1.0.0";x-friends:="org.eclipse.ecf.provider.irc" Require-Bundle: org.eclipse.equinox.common, org.eclipse.ecf, org.eclipse.ecf.datashare diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF index 633ab157f..04cb9629d 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Eclipse-LazyStart: true Eclipse-RegisterBuddy: org.eclipse.ecf Eclipse-BuddyPolicy: global Export-Package: org.eclipse.ecf.internal.provider.datashare;x-internal:=true, - org.eclipse.ecf.provider.datashare + org.eclipse.ecf.provider.datashare;version="1.4.0" Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 Require-Bundle: org.eclipse.equinox.common, diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/META-INF/MANIFEST.MF index e734c270a..7120b3e08 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: org.apache.commons.httpclient;version="[3.0.1,3.1.0]", org.osgi.service.url;version="1.0.0", org.osgi.util.tracker;version="1.3.2" Export-Package: org.eclipse.ecf.internal.provider.filetransfer.httpclient;x-internal:=true, - org.eclipse.ecf.provider.filetransfer.httpclient + org.eclipse.ecf.provider.filetransfer.httpclient;version="4.0.0" Bundle-Vendor: %plugin.provider Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-ActivationPolicy: lazy diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF index 2effb9a08..1d64634cf 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF @@ -30,7 +30,7 @@ Import-Package: org.apache.http;version="4.1.0", org.osgi.service.url;version="1.0.0", org.osgi.util.tracker;version="1.3.2" Export-Package: org.eclipse.ecf.internal.provider.filetransfer.httpclient4;x-internal:=true, - org.eclipse.ecf.provider.filetransfer.httpclient4 + org.eclipse.ecf.provider.filetransfer.httpclient4;version="1.0.0" Bundle-Vendor: %plugin.provider Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF index 12c42d5f7..b620e00bf 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF @@ -23,11 +23,11 @@ Import-Package: org.eclipse.core.net.proxy;resolution:=optional, org.osgi.util.tracker;version="1.3.2" Bundle-ClassPath: . Export-Package: org.eclipse.ecf.internal.provider.filetransfer;x-internal:=true, - org.eclipse.ecf.provider.filetransfer;x-friends:="org.eclipse.equinox.p2.repository", - org.eclipse.ecf.provider.filetransfer.browse, + org.eclipse.ecf.provider.filetransfer;version="3.2.0";x-friends:="org.eclipse.equinox.p2.repository", + org.eclipse.ecf.provider.filetransfer.browse;version="3.2.0", org.eclipse.ecf.provider.filetransfer.events.socket;version="1.0";x-friends:="org.eclipse.ecf.provider.filetransfer.httpclient", - org.eclipse.ecf.provider.filetransfer.identity, - org.eclipse.ecf.provider.filetransfer.outgoing, - org.eclipse.ecf.provider.filetransfer.retrieve, - org.eclipse.ecf.provider.filetransfer.util + org.eclipse.ecf.provider.filetransfer.identity;version="3.2.0", + org.eclipse.ecf.provider.filetransfer.outgoing;version="3.2.0", + org.eclipse.ecf.provider.filetransfer.retrieve;version="3.2.0", + org.eclipse.ecf.provider.filetransfer.util;version="3.2.0" Bundle-ActivationPolicy: lazy diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.bot/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.irc.bot/META-INF/MANIFEST.MF index c070a0c6e..9e00724dc 100644 --- a/providers/bundles/org.eclipse.ecf.provider.irc.bot/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.irc.bot/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.equinox.common, org.eclipse.ecf.presence;visibility:=reexport, org.eclipse.equinox.app Eclipse-LazyStart: true -Export-Package: org.eclipse.ecf.provider.irc.bot.handler +Export-Package: org.eclipse.ecf.provider.irc.bot.handler;version="1.0.0" Bundle-RequiredExecutionEnvironment: J2SE-1.4 Import-Package: org.osgi.framework;version="1.4.0", org.osgi.util.tracker;version="1.3.2" diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF index c2eb1feb5..a19bc770f 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF @@ -14,8 +14,8 @@ Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 Export-Package: org.eclipse.ecf.internal.provider.jmdns;x-internal:=true, - org.eclipse.ecf.provider.jmdns.container, - org.eclipse.ecf.provider.jmdns.identity + org.eclipse.ecf.provider.jmdns.container;version="4.1.0", + org.eclipse.ecf.provider.jmdns.identity;version="4.1.0" Import-Package: org.osgi.framework;version="1.3.0", org.osgi.service.log;version="1.3.0", org.osgi.util.tracker;version="1.3.2" diff --git a/providers/bundles/org.eclipse.ecf.provider.jslp/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.jslp/META-INF/MANIFEST.MF index fbf2f808b..bc7586be5 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jslp/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.jslp/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 Bundle-ClassPath: . Export-Package: org.eclipse.ecf.internal.provider.jslp;x-friends:="org.eclipse.ecf.tests.provider.jslp", - org.eclipse.ecf.provider.jslp.container, - org.eclipse.ecf.provider.jslp.identity + org.eclipse.ecf.provider.jslp.container;version="3.0.0", + org.eclipse.ecf.provider.jslp.identity;version="3.0.0" Bundle-ActivationPolicy: lazy diff --git a/providers/bundles/org.eclipse.ecf.provider.local/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.local/META-INF/MANIFEST.MF index ea6f2772d..a0ee97a75 100644 --- a/providers/bundles/org.eclipse.ecf.provider.local/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.local/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Import-Package: org.eclipse.ecf.core, org.osgi.framework Bundle-ActivationPolicy: lazy Bundle-Localization: bundle -Export-Package: org.eclipse.ecf.internal.provider.local, - org.eclipse.ecf.internal.provider.local.container, - org.eclipse.ecf.provider.local.identity +Export-Package: org.eclipse.ecf.internal.provider.local;x-internal:=true, + org.eclipse.ecf.internal.provider.local.container;x-internal:=true, + org.eclipse.ecf.provider.local.identity;version="1.1.0" Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0" diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF index ddd66c3d8..d8d958637 100644 --- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ecf;bundle-version="3.1.0", ch.ethz.iks.r_osgi.remote Bundle-Activator: org.eclipse.ecf.internal.provider.r_osgi.Activator Eclipse-LazyStart: true -Export-Package: org.eclipse.ecf.provider.r_osgi.identity +Export-Package: org.eclipse.ecf.provider.r_osgi.identity;version="3.2.0" Bundle-Vendor: %plugin.provider Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.3 diff --git a/providers/bundles/org.eclipse.ecf.provider.ui/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.ui/META-INF/MANIFEST.MF index 837c9e8ef..a47337736 100644 --- a/providers/bundles/org.eclipse.ecf.provider.ui/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.provider.ui;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.provider.ui.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -15,3 +15,4 @@ Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 Bundle-ActivationPolicy: lazy +Export-Package: org.eclipse.ecf.provider.ui.wizards;version="1.3.0" diff --git a/providers/bundles/org.eclipse.ecf.provider.ui/src/org/eclipse/ecf/provider/ui/wizards/GenericClientContainerConnectWizard.java b/providers/bundles/org.eclipse.ecf.provider.ui/src/org/eclipse/ecf/provider/ui/wizards/GenericClientContainerConnectWizard.java index 03fd29531..8779376d2 100644 --- a/providers/bundles/org.eclipse.ecf.provider.ui/src/org/eclipse/ecf/provider/ui/wizards/GenericClientContainerConnectWizard.java +++ b/providers/bundles/org.eclipse.ecf.provider.ui/src/org/eclipse/ecf/provider/ui/wizards/GenericClientContainerConnectWizard.java @@ -11,11 +11,8 @@ package org.eclipse.ecf.provider.ui.wizards; import java.net.URI; - import org.eclipse.ecf.core.IContainer; -import org.eclipse.ecf.core.identity.ID; -import org.eclipse.ecf.core.identity.IDCreateException; -import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.identity.*; import org.eclipse.ecf.core.security.ConnectContextFactory; import org.eclipse.ecf.core.security.IConnectContext; import org.eclipse.ecf.ui.IConnectWizard; @@ -25,6 +22,9 @@ import org.eclipse.ecf.ui.wizards.AbstractConnectWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.IWorkbench; +/** + * @since 1.4 + */ public class GenericClientContainerConnectWizard extends Wizard implements IConnectWizard { @@ -39,11 +39,11 @@ public class GenericClientContainerConnectWizard extends Wizard implements private IConnectContext connectContext; private URI uri; - + public GenericClientContainerConnectWizard() { super(); } - + public GenericClientContainerConnectWizard(URI uri) { super(); this.uri = uri; @@ -71,8 +71,8 @@ public class GenericClientContainerConnectWizard extends Wizard implements String password = wizardPage.getPassword(); if (wizardPage.shouldRequestUsername()) { connectContext = ConnectContextFactory - .createUsernamePasswordConnectContext(wizardPage - .getUsername(), password); + .createUsernamePasswordConnectContext( + wizardPage.getUsername(), password); } else { connectContext = ConnectContextFactory .createPasswordConnectContext(password); @@ -83,7 +83,7 @@ public class GenericClientContainerConnectWizard extends Wizard implements targetID = IDFactory.getDefault().createID( container.getConnectNamespace(), wizardPage.getConnectID()); } catch (IDCreateException e) { - new IDCreateErrorDialog(null,wizardPage.getConnectID(),e).open(); + new IDCreateErrorDialog(null, wizardPage.getConnectID(), e).open(); return false; } diff --git a/providers/bundles/org.eclipse.ecf.provider.ui/src/org/eclipse/ecf/provider/ui/wizards/GenericClientContainerConnectWizardPage.java b/providers/bundles/org.eclipse.ecf.provider.ui/src/org/eclipse/ecf/provider/ui/wizards/GenericClientContainerConnectWizardPage.java index 90e223776..516dc775a 100644 --- a/providers/bundles/org.eclipse.ecf.provider.ui/src/org/eclipse/ecf/provider/ui/wizards/GenericClientContainerConnectWizardPage.java +++ b/providers/bundles/org.eclipse.ecf.provider.ui/src/org/eclipse/ecf/provider/ui/wizards/GenericClientContainerConnectWizardPage.java @@ -11,22 +11,27 @@ package org.eclipse.ecf.provider.ui.wizards; import java.net.URI; - import org.eclipse.ecf.ui.SharedImages; import org.eclipse.ecf.ui.wizards.AbstractConnectWizardPage; -public class GenericClientContainerConnectWizardPage extends AbstractConnectWizardPage { +/** + * @since 1.4 + */ +public class GenericClientContainerConnectWizardPage extends + AbstractConnectWizardPage { public GenericClientContainerConnectWizardPage() { super("GenericClientContainerConnectWizardPage"); - setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.IMG_COLLABORATION_WIZARD)); + setImageDescriptor(SharedImages + .getImageDescriptor(SharedImages.IMG_COLLABORATION_WIZARD)); } - + public GenericClientContainerConnectWizardPage(URI uri) { - super("GenericClientContainerConnectWizardPage",uri); - setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.IMG_COLLABORATION_WIZARD)); + super("GenericClientContainerConnectWizardPage", uri); + setImageDescriptor(SharedImages + .getImageDescriptor(SharedImages.IMG_COLLABORATION_WIZARD)); } - + public boolean shouldRequestUsername() { return true; } diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF index 7bae26278..7cb9b59bd 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF @@ -17,8 +17,8 @@ Export-Package: org.eclipse.ecf.internal.provider.xmpp;x-internal:=true, org.eclipse.ecf.internal.provider.xmpp.events;x-internal:=true, org.eclipse.ecf.internal.provider.xmpp.filetransfer;x-internal:=true, org.eclipse.ecf.internal.provider.xmpp.smack;x-internal:=true, - org.eclipse.ecf.provider.xmpp, - org.eclipse.ecf.provider.xmpp.identity + org.eclipse.ecf.provider.xmpp;version="3.2.0", + org.eclipse.ecf.provider.xmpp.identity;version="3.2.0" Eclipse-BuddyPolicy: global Bundle-RequiredExecutionEnvironment: J2SE-1.5 Eclipse-ExtensibleAPI: true diff --git a/providers/bundles/org.eclipse.ecf.provider.zookeeper/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.zookeeper/META-INF/MANIFEST.MF index 4f7127163..2448edb65 100644 --- a/providers/bundles/org.eclipse.ecf.provider.zookeeper/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.zookeeper/META-INF/MANIFEST.MF @@ -23,8 +23,8 @@ Import-Package: org.apache.zookeeper, Require-Bundle: org.eclipse.equinox.common;bundle-version="3.5.0", org.eclipse.ecf.discovery;bundle-version="3.0.0", org.apache.hadoop.zookeeper;bundle-version="[3.3.3,3.4.0)" -Export-Package: org.eclipse.ecf.provider.zookeeper, - org.eclipse.ecf.provider.zookeeper.core, +Export-Package: org.eclipse.ecf.provider.zookeeper;version="1.0.0", + org.eclipse.ecf.provider.zookeeper.core;version="1.0.0", org.eclipse.ecf.provider.zookeeper.core.internal;x-internal:=true, org.eclipse.ecf.provider.zookeeper.node.internal;x-internal:=true, org.eclipse.ecf.provider.zookeeper.util;x-internal:=true diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF index 1a973a5be..514a7fe47 100644 --- a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF +++ b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF @@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.equinox.common, org.eclipse.ecf.remoteservice;bundle-version="3.0.0", org.eclipse.equinox.registry Eclipse-LazyStart: true -Export-Package: org.eclipse.ecf.internal.server.generic;x-internal:=true, - org.eclipse.ecf.server.generic, - org.eclipse.ecf.server.generic.app +Export-Package: org.eclipse.ecf.internal.server.generic;version="6.0.0";x-internal:=true, + org.eclipse.ecf.server.generic;version="6.0.0", + org.eclipse.ecf.server.generic.app;version="6.0.0" Import-Package: javax.xml.parsers, org.eclipse.equinox.app;version="1.0.0", org.osgi.framework, diff --git a/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF index c5921304a..3a08151a5 100644 --- a/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF +++ b/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Import-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.remoteservice, org.osgi.framework;version="1.3.0" Export-Package: org.eclipse.ecf.internal.server;x-internal:=true, - org.eclipse.ecf.server + org.eclipse.ecf.server;version="2.1.0" Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 Bundle-ActivationPolicy: lazy diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/META-INF/MANIFEST.MF b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/META-INF/MANIFEST.MF index 8fd800442..a1c73f639 100644 --- a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/META-INF/MANIFEST.MF +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/META-INF/MANIFEST.MF @@ -10,6 +10,6 @@ Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 Import-Package: org.osgi.framework Eclipse-LazyStart: true -Export-Package: org.eclipse.ecf.examples.remoteservices.common, +Export-Package: org.eclipse.ecf.examples.remoteservices.common;version="1.0.0", org.eclipse.ecf.internal.examples.remoteservices.common;x-internal:=true Bundle-ActivationPolicy: lazy |