Updates for v 0.3.3 buildECF_0_3_3_I20050710

5 files changed, 17 insertions, 111 deletions

diff --git a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..abee1e80a
--- /dev/null
+++ b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ECF Documentation
+Bundle-SymbolicName: org.eclipse.ecf.doc; singleton:=true
+Bundle-Version: 0.3.3
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.help
+Eclipse-AutoStart: true
diff --git a/doc/bundles/org.eclipse.ecf.doc/build.properties b/doc/bundles/org.eclipse.ecf.doc/build.properties
index d6c421f90..ad7a539f7 100644
--- a/doc/bundles/org.eclipse.ecf.doc/build.properties
+++ b/doc/bundles/org.eclipse.ecf.doc/build.properties
@@ -1,3 +1,4 @@
 bin.includes = plugin.xml,\
                html/,\
-               toc*.xml
+               toc*.xml,\
+               META-INF/
diff --git a/doc/bundles/org.eclipse.ecf.doc/plugin.xml b/doc/bundles/org.eclipse.ecf.doc/plugin.xml
index f5962e2cc..3f36b3498 100644
--- a/doc/bundles/org.eclipse.ecf.doc/plugin.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/plugin.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ecf.doc"
-   name="ECF Documentation"
-   version="0.3.1"
-   provider-name="Eclipse.org">
+<plugin>
 
-   <requires>
-      <import plugin="org.eclipse.help"/>
-   </requires>
-
-   <extension
+    <extension
          point="org.eclipse.help.toc">
       <toc
             file="toc.xml"
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 fdc7fce4e..9f278d4f8 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
@@ -6,17 +6,17 @@ Bundle-ClassPath: client.jar
 Bundle-Activator: org.eclipse.ecf.example.collab.ClientPlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: org.eclipse.ecf,
+ org.eclipse.ecf.provider,
+ org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.jdt.core,
  org.eclipse.core.resources,
- org.eclipse.ecf,
  org.eclipse.help.base,
  org.eclipse.jface.text,
  org.eclipse.ecf.presence,
  org.eclipse.ecf.ui,
- org.eclipse.ecf.discovery,
- org.eclipse.ecf.provider
+ org.eclipse.ecf.discovery
 Export-Package: org.eclipse.ecf.example.collab, org.eclipse.ecf.example.collab.share, org.eclipse.ecf.example.collab.share.url, org.eclipse.ecf.example.collab.share.io
 Eclipse-AutoStart: true
 Provide-Package: org.eclipse.ecf.example.collab
diff --git a/server-side/features/org.eclipse.ecf.server-feature/feature.xml b/server-side/features/org.eclipse.ecf.server-feature/feature.xml
index bd17b03fd..66140b1b0 100644
--- a/server-side/features/org.eclipse.ecf.server-feature/feature.xml
+++ b/server-side/features/org.eclipse.ecf.server-feature/feature.xml
@@ -42,100 +42,4 @@ otherwise indicated below, the terms and conditions of the EPL
 still apply to any source code in the Content.
    </license>
 
-   <requires>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.help.base"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.emf.commonj.sdo"/>
-      <import plugin="org.eclipse.emf.ecore.sdo"/>
-      <import plugin="org.eclipse.emf.ecore.sdo.editor"/>
-      <import plugin="org.eclipse.gef"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.ide"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ecf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.datashare"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.discovery"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.example.collab"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.example.datashare.hello"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.example.hello"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.example.library"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.example.sdo.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.example.sdo.gefeditor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.presence"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.sdo"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ecf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
 </feature>