Converted to MANIFEST.MF

10 files changed, 72 insertions, 82 deletions

diff --git a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..3dd9ce691
--- /dev/null
+++ b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.compare; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: compare.jar
+Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.compare,
+ org.eclipse.compare.contentmergeviewer,
+ org.eclipse.compare.internal,
+ org.eclipse.compare.internal.merge,
+ org.eclipse.compare.internal.patch,
+ org.eclipse.compare.rangedifferencer,
+ org.eclipse.compare.structuremergeviewer
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.eclipse.jface.text,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.core.runtime
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.compare/build.properties b/bundles/org.eclipse.compare/build.properties
index 3d04577a1..ee29c7721 100644
--- a/bundles/org.eclipse.compare/build.properties
+++ b/bundles/org.eclipse.compare/build.properties
@@ -13,6 +13,7 @@ bin.includes = icons/,\
                plugin.xml,\
                *.jar,\
                plugin.properties,\
-               about.html
+               about.html,\
+               META-INF/
 src.includes = about.html,\
                schema/
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index cefa81974..0eea060b5 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -12,6 +12,14 @@
 Eclipse Platform Build Notes<br>
 Compare</h1>
 
+Eclipse Build Input April 12th 2005
+
+<h2>Problem reports fixed</h2>
+Added MANIFEST.MF<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
 Eclipse Build Input March 29nd 2005
 
 <h2>Problem reports fixed</h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java
deleted file mode 100644
index 18e44aad8..000000000
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.compare.internal;
-
-/**
- * @deprecated Use org.eclipse.compare.IResourceProvider instead
- */
-public interface IResourceProvider extends org.eclipse.compare.IResourceProvider {
-	// will be removed after 3.1M6
-}
diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml
index 1c35d7526..99adfedc2 100644
--- a/bundles/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugin.xml
@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.compare"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.compare.internal.CompareUIPlugin">
-
-   <runtime>
-      <library name="compare.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
+<plugin>
 
+    
 <!-- Compare extension point definitions -->
    <extension-point id="streamMergers" name="%streamMergers" schema="schema/streamMergers.exsd"/>
    <extension-point id="structureCreators" name="%structureCreators" schema="schema/structureCreators.exsd"/>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..3dd9ce691
--- /dev/null
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.compare; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: compare.jar
+Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.compare,
+ org.eclipse.compare.contentmergeviewer,
+ org.eclipse.compare.internal,
+ org.eclipse.compare.internal.merge,
+ org.eclipse.compare.internal.patch,
+ org.eclipse.compare.rangedifferencer,
+ org.eclipse.compare.structuremergeviewer
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.eclipse.jface.text,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.core.runtime
+Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties
index 3d04577a1..ee29c7721 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/build.properties
@@ -13,6 +13,7 @@ bin.includes = icons/,\
                plugin.xml,\
                *.jar,\
                plugin.properties,\
-               about.html
+               about.html,\
+               META-INF/
 src.includes = about.html,\
                schema/
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index cefa81974..0eea060b5 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -12,6 +12,14 @@
 Eclipse Platform Build Notes<br>
 Compare</h1>
 
+Eclipse Build Input April 12th 2005
+
+<h2>Problem reports fixed</h2>
+Added MANIFEST.MF<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
 Eclipse Build Input March 29nd 2005
 
 <h2>Problem reports fixed</h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java
deleted file mode 100644
index 18e44aad8..000000000
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/IResourceProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.compare.internal;
-
-/**
- * @deprecated Use org.eclipse.compare.IResourceProvider instead
- */
-public interface IResourceProvider extends org.eclipse.compare.IResourceProvider {
-	// will be removed after 3.1M6
-}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
index 1c35d7526..99adfedc2 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.compare"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.compare.internal.CompareUIPlugin">
-
-   <runtime>
-      <library name="compare.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
+<plugin>
 
+    
 <!-- Compare extension point definitions -->
    <extension-point id="streamMergers" name="%streamMergers" schema="schema/streamMergers.exsd"/>
    <extension-point id="structureCreators" name="%structureCreators" schema="schema/structureCreators.exsd"/>