Convert to OSGi bundle manifest. Push version to 3.1.0.

3 files changed, 31 insertions, 30 deletions

diff --git a/org.eclipse.photran.ui/META-INF/MANIFEST.MF b/org.eclipse.photran.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..b54b7a77
--- /dev/null
+++ b/org.eclipse.photran.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Photran UI Plug-in
+Bundle-SymbolicName: org.eclipse.photran.ui; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: photranui.jar
+Bundle-Activator: org.eclipse.photran.ui.FortranUIPlugin
+Bundle-Vendor: University of Illinois at Urbana-Champaign and Los Alamos National Laboratory
+Bundle-Localization: plugin
+Export-Package: org.eclipse.photran.internal.ui.actions,
+ org.eclipse.photran.internal.ui.editor,
+ org.eclipse.photran.internal.ui.preferences,
+ org.eclipse.photran.ui
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.photran.core,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.ui,
+ org.eclipse.photran.cdtinterface,
+ org.eclipse.ui.views
+Eclipse-LazyStart: true
diff --git a/org.eclipse.photran.ui/build.properties b/org.eclipse.photran.ui/build.properties
index eea6daba..b9ce065b 100644
--- a/org.eclipse.photran.ui/build.properties
+++ b/org.eclipse.photran.ui/build.properties
@@ -1,6 +1,7 @@
-source.fdtui.jar = src/
-output.fdtui.jar = bin/
+source.photranui.jar = src/
+output.photranui.jar = bin/
 bin.includes = plugin.xml,\
-               fdtui.jar,\
-               icons/
+               photranui.jar,\
+               icons/,\
+               META-INF/
 jars.extra.classpath = ../org.eclipse.photran.core/f95parser.jar
diff --git a/org.eclipse.photran.ui/plugin.xml b/org.eclipse.photran.ui/plugin.xml
index 44a17f4c..4ebbc042 100644
--- a/org.eclipse.photran.ui/plugin.xml
+++ b/org.eclipse.photran.ui/plugin.xml
@@ -1,32 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.photran.ui"
-   name="Photran UI Plug-in"
-   version="3.0.0"
-   provider-name="University of Illinois at Urbana-Champaign and Los Alamos National Laboratory"
-   class="org.eclipse.photran.ui.FortranUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="fdtui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.photran.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.photran.cdtinterface"/>
-      <import plugin="org.eclipse.ui.views"/>
-   </requires>
-
-   <!--==========================================-->
+     <!--==========================================-->
    <!-- Free Form and Fixed Form Fortran Editors -->   
    <!--==========================================-->
    <extension