bug 316050: these compare and team examples should be converted from old-style plugins to real OSGi bundles in 3.7

9 files changed, 96 insertions, 83 deletions

diff --git a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..163a19d99
--- /dev/null
+++ b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.compare.examples.xml; singleton:=true
+Bundle-Version: 3.3.200.qualifier
+Bundle-ClassPath: xmlcompareexamples.jar
+Bundle-Activator: org.eclipse.compare.examples.xml.XMLPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.compare.examples.xml,
+ org.eclipse.compare.examples.xml.ui
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.compare,
+ org.eclipse.ui,
+ org.eclipse.jface.text,
+ org.junit
+Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.compare.examples.xml/build.properties b/examples/org.eclipse.compare.examples.xml/build.properties
index 678cea0f2..c86c3af9b 100644
--- a/examples/org.eclipse.compare.examples.xml/build.properties
+++ b/examples/org.eclipse.compare.examples.xml/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2010 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
@@ -11,10 +11,11 @@
 source.xmlcompareexamples.jar = src/
 
 bin.includes = doc-html/,\
-				about.html,\
-				plugin.properties,\
-				plugin.xml,\
-				icons/,\
-				xmlcompareexamples.jar
+               about.html,\
+               plugin.properties,\
+               plugin.xml,\
+               icons/,\
+               xmlcompareexamples.jar,\
+               META-INF/
 
 src.includes = about.html
diff --git a/examples/org.eclipse.compare.examples.xml/plugin.xml b/examples/org.eclipse.compare.examples.xml/plugin.xml
index 4a57bacd5..84dec6d63 100644
--- a/examples/org.eclipse.compare.examples.xml/plugin.xml
+++ b/examples/org.eclipse.compare.examples.xml/plugin.xml
@@ -1,29 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.compare.examples.xml"
-   name="%pluginName"
-   version="3.3.200.qualifier"
-   provider-name="%providerName"
-   class="org.eclipse.compare.examples.xml.XMLPlugin">
+<plugin>
 
-   <runtime>
-      <library name="xmlcompareexamples.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.junit"/>
-   </requires>
-
-
-   <extension-point id="idMapping" name="%idMapping" schema="schema/idMapping.exsd"/>
+     <extension-point id="idMapping" name="%idMapping" schema="schema/idMapping.exsd"/>
 
    <extension
          point="org.eclipse.compare.examples.xml.idMapping">
diff --git a/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..84b55ad53
--- /dev/null
+++ b/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.compare.examples; singleton:=true
+Bundle-Version: 3.1.200.qualifier
+Bundle-ClassPath: compareexamples.jar
+Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.compare.examples.structurecreator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.eclipse.compare,
+ org.eclipse.jface.text,
+ org.eclipse.core.runtime.compatibility
+Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.compare.examples/build.properties b/examples/org.eclipse.compare.examples/build.properties
index 6a8c1a2ae..598a4ad74 100644
--- a/examples/org.eclipse.compare.examples/build.properties
+++ b/examples/org.eclipse.compare.examples/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2010 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
@@ -11,9 +11,10 @@
 source.compareexamples.jar = src/
 
 bin.includes = doc-html/,\
-				about.html,\
-				plugin.properties,\
-				plugin.xml,\
-				compareexamples.jar
+               about.html,\
+               plugin.properties,\
+               plugin.xml,\
+               compareexamples.jar,\
+               META-INF/
 
 src.includes = about.html
diff --git a/examples/org.eclipse.compare.examples/plugin.xml b/examples/org.eclipse.compare.examples/plugin.xml
index 183326cf9..cd283e240 100644
--- a/examples/org.eclipse.compare.examples/plugin.xml
+++ b/examples/org.eclipse.compare.examples/plugin.xml
@@ -1,27 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 
-<plugin
-   id="org.eclipse.compare.examples"
-   name="%pluginName"
-   version="3.1.200.qualifier"
-   provider-name="%providerName">
+<plugin>
 
-   <runtime>
-      <library name="compareexamples.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-   </requires>
-
-   <extension
+     <extension
          point="org.eclipse.compare.contentMergeViewers">
       <viewer
             extensions="kvtxt"
diff --git a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..dfc38fc5c
--- /dev/null
+++ b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
@@ -0,0 +1,35 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.team.examples.filesystem; singleton:=true
+Bundle-Version: 3.4.100.qualifier
+Bundle-ClassPath: teamfilesystem.jar
+Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.team.examples.filesystem,
+ org.eclipse.team.examples.filesystem.history,
+ org.eclipse.team.examples.filesystem.subscriber,
+ org.eclipse.team.examples.filesystem.ui,
+ org.eclipse.team.examples.localhistory,
+ org.eclipse.team.examples.model,
+ org.eclipse.team.examples.model.mapping,
+ org.eclipse.team.examples.model.ui,
+ org.eclipse.team.examples.model.ui.mapping,
+ org.eclipse.team.examples.pessimistic,
+ org.eclipse.team.examples.pessimistic.ui
+Require-Bundle: org.eclipse.core.runtime.compatibility,
+ org.eclipse.ui.ide;resolution:=optional,
+ org.eclipse.ui.views;resolution:=optional,
+ org.eclipse.jface.text;resolution:=optional,
+ org.eclipse.ui.workbench.texteditor;resolution:=optional,
+ org.eclipse.ui.editors;resolution:=optional,
+ org.eclipse.core.resources,
+ org.eclipse.team.core,
+ org.eclipse.team.ui,
+ org.eclipse.compare,
+ org.eclipse.ui,
+ org.eclipse.core.filesystem,
+ org.eclipse.ui.navigator
+Bundle-ActivationPolicy: lazy
+Plugin-Class: org.eclipse.team.examples.filesystem.FileSystemPlugin
diff --git a/examples/org.eclipse.team.examples.filesystem/build.properties b/examples/org.eclipse.team.examples.filesystem/build.properties
index 48ceb9e09..893b8339e 100644
--- a/examples/org.eclipse.team.examples.filesystem/build.properties
+++ b/examples/org.eclipse.team.examples.filesystem/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
+# Copyright (c) 2000, 2010 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
@@ -11,4 +11,10 @@
 # Eclipse build contribution
 source.teamfilesystem.jar=src/
 src.includes=about.html
-bin.includes=about.html,icons/,doc-html/,plugin.xml,plugin.properties,*.jar
+bin.includes = about.html,\
+               icons/,\
+               doc-html/,\
+               plugin.xml,\
+               plugin.properties,\
+               *.jar,\
+               META-INF/
diff --git a/examples/org.eclipse.team.examples.filesystem/plugin.xml b/examples/org.eclipse.team.examples.filesystem/plugin.xml
index 3acf8f24f..6a28e59c2 100644
--- a/examples/org.eclipse.team.examples.filesystem/plugin.xml
+++ b/examples/org.eclipse.team.examples.filesystem/plugin.xml
@@ -3,42 +3,17 @@
 <!-- =================================================================================== -->
 <!-- Team Examples Plug-in Manifest 					                                 -->
 <!-- =================================================================================== -->
-<plugin
-   id="org.eclipse.team.examples.filesystem"
-   name="%pluginName"
-   version="3.4.100.qualifier"
-   provider-name="%providerName"
-   class="org.eclipse.team.examples.filesystem.FileSystemPlugin">
+<plugin>
 
 <!-- =================================================================================== -->
 <!-- Libraries						 					                                 -->
 <!-- =================================================================================== -->
 
-<runtime>
-	<library name="teamfilesystem.jar">
-    	<export name="*"/>
-	</library>
-</runtime>
-   
+
 <!-- =================================================================================== -->
 <!-- Imports						 					                                 -->
 <!-- =================================================================================== -->
    
-<requires>
-	<import plugin="org.eclipse.core.runtime.compatibility"/> 
-	<import plugin="org.eclipse.ui.ide" optional="true"/>
-	<import plugin="org.eclipse.ui.views" optional="true"/>
-	<import plugin="org.eclipse.jface.text" optional="true"/>
-	<import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
-	<import plugin="org.eclipse.ui.editors" optional="true"/>
-	<import plugin="org.eclipse.core.resources"/>
-	<import plugin="org.eclipse.team.core"/>
-	<import plugin="org.eclipse.team.ui"/>
-	<import plugin="org.eclipse.compare"/>
-	<import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.filesystem"/>
- <import plugin="org.eclipse.ui.navigator"/>
-</requires>
 
 <!-- =================================================================================== -->
 <!-- Repository Providers																 -->