Added basic OSGi manifest for #2199

svn changeset:9169/svn branch:6.2

diff --git a/build/build.xml b/build/build.xml
index 43eca80317fb459a3db54044ce781c6c6525f562..15f650659f6c0f3c72fc6b017baab5324b4a59a1 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -1014,10 +1014,11 @@
                <mkdir dir="${output-dir}/META-INF"/>
                <echo file="${output-dir}/META-INF/VERSION">${version}</echo> 
                <echo file="${output-dir}/META-INF/GWT-VERSION">${gwt-version}</echo> 
-               <jar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" compress="true">
+               <jar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" compress="true" manifest="build/package/META-INF/MANIFEST.MF">
                        <metainf dir="${output-dir}/META-INF"/>
                        <manifest>
                                <attribute name="Vaadin-Widgetsets" value="com.vaadin.terminal.gwt.DefaultWidgetSet" />
+                               <attribute name="Bundle-Version" value="${version}" />
                        </manifest>
                        <fileset dir="${result-path}/classes">
                                <patternset>

diff --git a/build/package/META-INF/MANIFEST.MF b/build/package/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..b99f8b5
--- /dev/null
+++ b/build/package/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Bundle-ManifestVersion: 2
+Bundle-Name: Vaadin
+Bundle-SymbolicName: com.vaadin
+Bundle-Vendor: IT Mill Ltd
+Export-Package: VAADIN.themes, VAADIN.themes.base, VAADIN.themes.base.absolutelayout, VAADIN.themes.base.accordion, VAADIN.themes.base.button, VAADIN.themes.base.caption, VAADIN.themes.base.common, VAADIN.themes.base.common.img, VAADIN.themes.base.csslayout, VAADIN.themes.base.customcomponent, VAADIN.themes.base.customlayout, VAADIN.themes.base.datefield, VAADIN.themes.base.formlayout, VAADIN.themes.base.gridlayout, VAADIN.themes.base.link, VAADIN.themes.base.menubar, VAADIN.themes.base.notification, VAADIN.themes.base.orderedlayout, VAADIN.themes.base.panel, VAADIN.themes.base.popupview, VAADIN.themes.base.progressindicator, VAADIN.themes.base.select, VAADIN.themes.base.shadow, VAADIN.themes.base.shadow.img, VAADIN.themes.base.slider, VAADIN.themes.base.splitpanel, VAADIN.themes.base.table, VAADIN.themes.base.tabsheet, VAADIN.themes.base.textfield, VAADIN.themes.base.tree, VAADIN.themes.base.upload, VAADIN.themes.base.window, VAADIN.themes.base.window.img.shadow, VAADIN.themes.reindeer, VAADIN.themes.reindeer.accordion, VAADIN.themes.reindeer.button, VAADIN.themes.reindeer.button.img, VAADIN.themes.reindeer.button.img.black, VAADIN.themes.reindeer.common, VAADIN.themes.reindeer.common.icons, VAADIN.themes.reindeer.common.img, VAADIN.themes.reindeer.datefield, VAADIN.themes.reindeer.datefield.img, VAADIN.themes.reindeer.formlayout, VAADIN.themes.reindeer.label, VAADIN.themes.reindeer.layouts,VAADIN.themes.reindeer.layouts.img,VAADIN.themes.reindeer.menubar,VAADIN.themes.reindeer.menubar.img,VAADIN.themes.reindeer.notification,VAADIN.themes.reindeer.notification.img,VAADIN.themes.reindeer.panel,VAADIN.themes.reindeer.progressindicator,VAADIN.themes.reindeer.progressindicator.img,VAADIN.themes.reindeer.select,VAADIN.themes.reindeer.select.img,VAADIN.themes.reindeer.select.img.black,VAADIN.themes.reindeer.slider,VAADIN.themes.reindeer.slider.img,VAADIN.themes.reindeer.splitpanel,VAADIN.themes.reindeer.splitpanel.img,VAADIN.themes.reindeer.table,VAADIN.themes.reindeer.table.img,VAADIN.themes.reindeer.tabsheet,VAADIN.themes.reindeer.tabsheet.img,VAADIN.themes.reindeer.tabsheet.img.bar,VAADIN.themes.reindeer.tabsheet.img.framed,VAADIN.themes.reindeer.textfield,VAADIN.themes.reindeer.textfield.img,VAADIN.themes.reindeer.tree,VAADIN.themes.reindeer.tree.img,VAADIN.themes.reindeer.window,VAADIN.themes.reindeer.window.img,VAADIN.themes.reindeer.window.img.black,VAADIN.themes.runo,VAADIN.themes.runo.absolutelayout,VAADIN.themes.runo.accordion,VAADIN.themes.runo.accordion.img,VAADIN.themes.runo.button,VAADIN.themes.runo.button.img,VAADIN.themes.runo.caption,VAADIN.themes.runo.common,VAADIN.themes.runo.common.img,VAADIN.themes.runo.datefield,VAADIN.themes.runo.datefield.img,VAADIN.themes.runo.formlayout,VAADIN.themes.runo.gridlayout,VAADIN.themes.runo.icons,VAADIN.themes.runo.link,VAADIN.themes.runo.menubar,VAADIN.themes.runo.notification,VAADIN.themes.runo.notification.img,VAADIN.themes.runo.orderedlayout,VAADIN.themes.runo.panel,VAADIN.themes.runo.panel.img,VAADIN.themes.runo.popupview,VAADIN.themes.runo.progressindicator,VAADIN.themes.runo.progressindicator.img,VAADIN.themes.runo.select,VAADIN.themes.runo.select.img,VAADIN.themes.runo.shadow,VAADIN.themes.runo.shadow.img,VAADIN.themes.runo.slider,VAADIN.themes.runo.slider.img,VAADIN.themes.runo.splitpanel,VAADIN.themes.runo.splitpanel.img,VAADIN.themes.runo.table,VAADIN.themes.runo.table.img,VAADIN.themes.runo.tabsheet,VAADIN.themes.runo.tabsheet.img,VAADIN.themes.runo.textfield,VAADIN.themes.runo.textfield.img,VAADIN.themes.runo.tree,VAADIN.themes.runo.tree.img,VAADIN.themes.runo.window,VAADIN.themes.runo.window.img,VAADIN.themes.runo.window.img.shadow,VAADIN.widgetsets,VAADIN.widgetsets.com.vaadin.terminal.gwt.DefaultWidgetSet,com.vaadin,com.vaadin.annotations,com.vaadin.data,com.vaadin.data.util,com.vaadin.data.validator,com.vaadin.event,com.vaadin.external.org.apache.commons.fileupload,com.vaadin.external.org.apache.commons.fileupload.disk,com.vaadin.external.org.apache.commons.fileupload.portlet,com.vaadin.external.org.apache.commons.fileupload.servlet,com.vaadin.external.org.apache.commons.fileupload.util,com.vaadin.portal.gwt,com.vaadin.portal.gwt.client,com.vaadin.service,com.vaadin.terminal,com.vaadin.terminal.gwt,com.vaadin.terminal.gwt.client,com.vaadin.terminal.gwt.client.ui,com.vaadin.terminal.gwt.client.ui.layout,com.vaadin.terminal.gwt.client.ui.richtextarea,com.vaadin.terminal.gwt.server,com.vaadin.tools,com.vaadin.ui,com.vaadin.util
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: javax.servlet; version="2.3.0",javax.servlet.http; version="2.3.0"