3 files changed, 24 insertions, 25 deletions

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"