Add explicit dependency to scope.lttng.kernel plugin

Since that plugin does not provide extension points, we need to ensure
it gets loaded before the "views" UI plugin.

Change-Id: If4d7fa9b6ab7ff5d3c6ea50ef1681a89c5ebbf0c
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>

diff --git a/tmf/org.lttng.scope.tmf2.views.ui/META-INF/MANIFEST.MF b/tmf/org.lttng.scope.tmf2.views.ui/META-INF/MANIFEST.MF
index 950203b8b6751edde8e363b45f702bb9cf712168..1b6fe073e245145df9633447f175e1213e1e85d1 100644 (file)
--- a/tmf/org.lttng.scope.tmf2.views.ui/META-INF/MANIFEST.MF
+++ b/tmf/org.lttng.scope.tmf2.views.ui/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.tmf.core,
  org.eclipse.tracecompass.tmf.ui,
  org.eclipse.core.resources,
- org.eclipse.tracecompass.common.core
+ org.eclipse.tracecompass.common.core,
+ org.lttng.scope.lttng.kernel.core
 Export-Package: org.lttng.scope.tmf2.views.ui.activator.internal;x-internal:=true,
  org.lttng.scope.tmf2.views.ui.jfx,
  org.lttng.scope.tmf2.views.ui.jfx.examples,

diff --git a/tmf/org.lttng.scope.tmf2.views.ui/src/org/lttng/scope/tmf2/views/ui/activator/internal/Activator.java b/tmf/org.lttng.scope.tmf2.views.ui/src/org/lttng/scope/tmf2/views/ui/activator/internal/Activator.java
index c418eac2274f6f9d44fc392450f2f9acd649b1f1..66543a54d22fcc804878913111279b3bfed5697d 100644 (file)
--- a/tmf/org.lttng.scope.tmf2.views.ui/src/org/lttng/scope/tmf2/views/ui/activator/internal/Activator.java
+++ b/tmf/org.lttng.scope.tmf2.views.ui/src/org/lttng/scope/tmf2/views/ui/activator/internal/Activator.java
@@ -32,6 +32,13 @@ public class Activator extends ScopeUIActivator {
     @Override
     protected void startActions() {
         Platform.setImplicitExit(false);
+
+        /*
+         * Explicitly load plugins we know we depend on. This is very ugly, but since
+         * we're not using extension points for our extensions we have to do it this
+         * way, until we do proper orchestration.
+         */
+        new org.lttng.scope.lttng.kernel.core.activator.internal.Startup();
     }
 
     @Override