Add the new plugins to the RCP

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

diff --git a/lttng/pom.xml b/lttng/pom.xml
index ab1f4e3592dee05bdae862e97d4a5776c9af78fc..0cf349b3ea4fdf3199e269e0399c0ce2887418ff 100644 (file)
--- a/lttng/pom.xml
+++ b/lttng/pom.xml
@@ -44,6 +44,8 @@
     <module>org.eclipse.tracecompass.lttng2.ust.core.tests</module>
     <module>org.eclipse.tracecompass.lttng2.ust.ui</module>
     <module>org.eclipse.tracecompass.lttng2.ust.ui.tests</module>
+
+    <module>org.lttng.scope.lttng.kernel.core</module>
   </modules>
 
   <profiles>

diff --git a/pom.xml b/pom.xml
index 2f0949435f95ce42721289e0b5d5098ca3eed3c9..d2801f41cf2a78887d98b1328144fdebf4b21ad3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -467,6 +467,16 @@
             <compilerArguments>
               <annotationpath>common/org.eclipse.tracecompass.common.core/annotations</annotationpath>
             </compilerArguments>
+            <extraClasspathElements>
+              <!-- Include the jfxswt.jar, which contains the JavaFX embedding functionality -->
+              <extraClasspathElement>
+                <groupId>com.oracle</groupId>
+                <artifactId>javafx</artifactId>
+                <version>8.0.0-SNAPSHOT</version>
+                <systemPath>${java.home}/lib/jfxswt.jar</systemPath>
+                <scope>system</scope>
+              </extraClasspathElement>
+            </extraClasspathElements>
           </configuration>
         </plugin>
 

diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml
index 5953f75771488e6b67b5e0bfd1f784f42263a6ee..0bc3276bf6035fabdbd6ac6b82b4ed8ed8082bd7 100644 (file)
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -309,4 +309,33 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.lttng.scope.lttng.kernel.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.lttng.scope.tmf2.views.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.lttng.scope.tmf2.views.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.fx.osgi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>

diff --git a/rcp/org.eclipse.tracecompass.rcp/pom.xml b/rcp/org.eclipse.tracecompass.rcp/pom.xml
index 4984e3d7e8fee7aedda191b9d23bdcd98dccac90..7269aa9c1f3adcc58b567e9a18ff74a021931b2c 100644 (file)
--- a/rcp/org.eclipse.tracecompass.rcp/pom.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/pom.xml
@@ -56,6 +56,7 @@
                 <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86"/>
                 <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
                 <plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
+                <plugin id="org.eclipse.fx.osgi"/>
                 <plugin id="org.eclipse.ui.cocoa"/>
                 <plugin id="org.eclipse.ui.trace"/>
                 <plugin id="org.eclipse.ui.views.log"/>

diff --git a/tmf/pom.xml b/tmf/pom.xml
index 77d1318899524d746edd86c9360002eb37dfc927..14c2c4be62313fc03e538105d819aa08b91d8b5b 100644 (file)
--- a/tmf/pom.xml
+++ b/tmf/pom.xml
@@ -46,6 +46,9 @@
     <module>org.eclipse.tracecompass.tmf.remote.core.tests</module>
     <module>org.eclipse.tracecompass.tmf.remote.ui</module>
     <module>org.eclipse.tracecompass.tmf.remote.ui.tests</module>
+
+    <module>org.lttng.scope.tmf2.views.core</module>
+    <module>org.lttng.scope.tmf2.views.ui</module>
   </modules>
 
   <profiles>