Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2016-04-01 11:18:43 -0400
committerMarkus Knauer2016-04-05 04:38:46 -0400
commitce92416c419b14df40b7a288e51d82208596cae5 (patch)
treead9ce59f325ef9655a834f1620f86e7383f533c7 /bundles
parent4ac5312de7161bb121579db27808731b29adda60 (diff)
downloadorg.eclipse.rap-ce92416c419b14df40b7a288e51d82208596cae5.tar.gz
org.eclipse.rap-ce92416c419b14df40b7a288e51d82208596cae5.tar.xz
org.eclipse.rap-ce92416c419b14df40b7a288e51d82208596cae5.zip
Provide OSGi and p2 capabilities to detect RWT presence
Provide a capability in the bundle manifest including a version that allows OSGi to detect the presence of RWT in the runtime, and to wire other bundles accordingly. Add p2 metadata that allows p2 to decide in a similar way as OSGi which installable units need to be taken into account. Bug 490922 - Provide capability in RWT bundle and require it in other RAP bundles Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=490922 Change-Id: I29bab69ffedf663e95e6790ba5940f69f867ae96 Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.rap.rwt/META-INF/MANIFEST.MF1
-rw-r--r--bundles/org.eclipse.rap.rwt/META-INF/p2.inf11
2 files changed, 12 insertions, 0 deletions
diff --git a/bundles/org.eclipse.rap.rwt/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.rwt/META-INF/MANIFEST.MF
index 4e40e8433f..186fce1ad8 100644
--- a/bundles/org.eclipse.rap.rwt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.rwt/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 3.1.0.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
+Provide-Capability: org.eclipse.rap; org.eclipse.rap.rwt; version:Version=3.1
Import-Package: javax.servlet;version="[2.3.0,4.0.0)",
javax.servlet.http;version="[2.3.0,4.0.0)",
javax.xml.parsers,
diff --git a/bundles/org.eclipse.rap.rwt/META-INF/p2.inf b/bundles/org.eclipse.rap.rwt/META-INF/p2.inf
new file mode 100644
index 0000000000..c583cda090
--- /dev/null
+++ b/bundles/org.eclipse.rap.rwt/META-INF/p2.inf
@@ -0,0 +1,11 @@
+# In addition to the Provide-Capability header in the bundle MANIFEST, it is
+# necessary that p2 has some means of detecting the same dependency structure
+# between RAP RWT-based bundles because p2 is not aware of the Provide- and
+# Require-Capability headers.
+#
+# See bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=313553 for p2
+# See bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=490922 for RAP
+
+provides.0.namespace = org.eclipse.rap
+provides.0.name = org.eclipse.rap.rwt
+provides.0.version = $version$

Back to the top