Fixes for manifest.mf and plugin.xml inconsistency

4 files changed, 27 insertions, 22 deletions

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 532345de5..dfd9b8f39 100644
--- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
@@ -1,24 +1,13 @@
 Manifest-Version: 1.0
-Bundle-Name: Eclipse Communications Framework Provider Plug-in
-Bundle-SymbolicName: org.eclipse.ecf.provider; singleton=true
+Bundle-SymbolicName: org.eclipse.ecf.provider
 Bundle-Version: 0.0.1
-Bundle-ClassPath: provider.jar
+Bundle-Name: ECF Provider Plugin
+Bundle-Vendor: Eclipse.org
 Bundle-Activator: org.eclipse.ecf.provider.ProviderPlugin
-Bundle-Vendor: eclipse.org
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ecf
 Eclipse-AutoStart: true
 DynamicImport-Package: *
-Provide-Package: org.eclipse.ecf.provider,
-org.eclipse.ecf.provider.comm.tcp
-org.eclipse.ecf.provider.generic,
-org.eclipse.ecf.provider.generic.events
-org.eclipse.ecf.provider.generic.gmm
-Bundle-SymbolicName: org.eclipse.ecf.provider
-Bundle-Version: 0.0.1
-Bundle-Name: ECF - Provider Plugin
-Bundle-Vendor: Eclipse.org
-Bundle-Activator: org.eclipse.ecf.provider.ProviderPlugin
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ecf
 
 
diff --git a/framework/bundles/org.eclipse.ecf.provider/plugin.xml b/framework/bundles/org.eclipse.ecf.provider/plugin.xml
index 1b3e5ea30..66c312e69 100644
--- a/framework/bundles/org.eclipse.ecf.provider/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.provider/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.ecf.provider"
-   name="ECF Provider Plug-in"
+   name="ECF Provider Plugin"
    version="0.0.1"
    provider-name="eclipse.org"
    class="org.eclipse.ecf.provider.ProviderPlugin">
@@ -13,10 +13,6 @@
       </library>
    </runtime>
 
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ecf"/>
-   </requires>
    <extension
          point="org.eclipse.ecf.containerFactory">
       <containerFactory
diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
index 800dac07d..f7d64c4d5 100644
--- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
@@ -15,3 +15,5 @@ Provide-Package: org.eclipse.ecf.core,
  org.eclipse.ecf.core.comm,
  org.eclipse.ecf.core.comm.provider,
  org.eclipse.ecf.core.util
+Require-Bundle: org.eclipse.osgi,
+ org.eclipse.core.runtime
diff --git a/framework/bundles/org.eclipse.ecf/plugin.xml b/framework/bundles/org.eclipse.ecf/plugin.xml
index 35abec8a1..c3c37c3b0 100644
--- a/framework/bundles/org.eclipse.ecf/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf/plugin.xml
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin>
+<plugin
+   id="org.eclipse.ecf"
+   name="ECF - Eclipse Communications Framework"
+   version="0.1.0"
+   provider-name="Eclipse.org"
+   class="org.eclipse.ecf.internal.core.ECFPlugin">
+
+   <runtime>
+      <library name="ecf.jar">
+         <export name="*"/>
+      </library>
+   </runtime>
+
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+   </requires>
+
    <extension-point id="containerFactory" name="ECF Container Factory" schema="schema/containerFactory.exsd"/>
    <extension-point id="namespace" name="ECF Namespace" schema="schema/namespace.exsd"/>
    <extension-point id="comm" name="ECF Connection Factory" schema="schema/comm.exsd"/>
+   
    <extension
          point="org.eclipse.ecf.containerFactory">
       <containerFactory