Fixed bug 316052: Change org.eclipse.ui.examples.javaeditor from old-style plugin to real OSGi bundles in 3.7

4 files changed, 39 insertions, 33 deletions

diff --git a/org.eclipse.ui.examples.javaeditor/.classpath b/org.eclipse.ui.examples.javaeditor/.classpath
index 81b25ea2fc8..074c814aa72 100644
--- a/org.eclipse.ui.examples.javaeditor/.classpath
+++ b/org.eclipse.ui.examples.javaeditor/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="Eclipse Java Editor Example"/>
-	<classpathentry kind="src" path="Template Editor Example"/>
+	<classpathentry kind="src" output="javaEditorBin" path="Eclipse Java Editor Example"/>
+	<classpathentry kind="src" output="templateEditorBin" path="Template Editor Example"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ui.examples.javaeditor/META-INF/MANIFEST.MF b/org.eclipse.ui.examples.javaeditor/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..6bdee4a00b0
--- /dev/null
+++ b/org.eclipse.ui.examples.javaeditor/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.ui.examples.javaeditor; singleton:=true
+Bundle-Version: 3.1.200.qualifier
+Bundle-ClassPath: javaeditorexample.jar,
+ templateeditorexample.jar
+Bundle-Activator: org.eclipse.ui.examples.javaeditor.JavaEditorExamplePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.ui.examples.javaeditor,
+ org.eclipse.ui.examples.javaeditor.java,
+ org.eclipse.ui.examples.javaeditor.javadoc,
+ org.eclipse.ui.examples.javaeditor.util,
+ org.eclipse.ui.examples.templateeditor.editors,
+ org.eclipse.ui.examples.templateeditor.preferences,
+ org.eclipse.ui.examples.templateeditor.template
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.views
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/org.eclipse.ui.examples.javaeditor/build.properties b/org.eclipse.ui.examples.javaeditor/build.properties
index 3d1c50afb80..87f7e849410 100644
--- a/org.eclipse.ui.examples.javaeditor/build.properties
+++ b/org.eclipse.ui.examples.javaeditor/build.properties
@@ -11,13 +11,17 @@
 source.javaeditorexample.jar = Eclipse Java Editor Example/
 source.templateeditorexample.jar = Template Editor Example/
 
+output.javaeditorexample.jar = javaEditorBin/
+output.templateeditorexample.jar = templateEditorBin/
+
 bin.includes = doc-html/,\
-				icons/,\
-				templates/,\
-				about.html,\
-				plugin.properties,\
-				plugin.xml,\
-				*.jar
+               icons/,\
+               templates/,\
+               about.html,\
+               plugin.properties,\
+               plugin.xml,\
+               *.jar,\
+               META-INF/
 
 jars.compile.order = javaeditorexample.jar,\
                      templateeditorexample.jar
diff --git a/org.eclipse.ui.examples.javaeditor/plugin.xml b/org.eclipse.ui.examples.javaeditor/plugin.xml
index d854f4922b6..3474dda3d56 100644
--- a/org.eclipse.ui.examples.javaeditor/plugin.xml
+++ b/org.eclipse.ui.examples.javaeditor/plugin.xml
@@ -1,29 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ui.examples.javaeditor"
-   name="%pluginName"
-   version="3.1.100.qualifier"
-   provider-name="%providerName"
-   class="org.eclipse.ui.examples.javaeditor.JavaEditorExamplePlugin">
-
-   <runtime>
-      <library name="javaeditorexample.jar">
-         <export name="*"/>
-      </library>
-      <library name="templateeditorexample.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.views"/>
-   </requires>
-
+<plugin>
 
 <!-- =========================================================================== -->
 <!-- Java Editor Example                                                         -->