Merge branch 'master' into lttng-luna

Conflicts:
	lttng/org.eclipse.linuxtools.tracing.rcp.product/tracing.product

diff --cc org.eclipse.linuxtools.tracing.rcp.branding.feature/pom.xml
index 0000000000000000000000000000000000000000,3384ce9ec8f614cbe642197ba663c4583cd53bbb..235a9a507dcbe241bb3d9b5953ab223b782a5c66
mode 000000,100644..100644
--- /dev/null
--- 2/org.eclipse.linuxtools.tracing.rcp.branding.feature/pom.xml
+++ b/org.eclipse.linuxtools.tracing.rcp.branding.feature/pom.xml
@@@ -1,0 -1,66 +1,66 @@@
 -    <version>2.1.0-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+    Copyright (C) 2013 Ericsson
+ 
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+ -->
+ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <modelVersion>4.0.0</modelVersion>
+ 
+   <parent>
+     <artifactId>linuxtools-lttng-parent</artifactId>
+     <groupId>org.eclipse.linuxtools.lttng</groupId>
++    <version>3.0.0-SNAPSHOT</version>
+   </parent>
+ 
+   <artifactId>org.eclipse.linuxtools.tracing.rcp.branding.feature</artifactId>
+   <version>0.0.1-SNAPSHOT</version>
+   <packaging>eclipse-feature</packaging>
+ 
+   <name>Linux Tools Trace Viewer Branding Feature</name>
+ 
+   <groupId>org.eclipse.linuxtools.tracing.rcp</groupId>
+ 
+   <build>
+     <plugins>
+       <plugin>
+         <groupId>org.eclipse.tycho.extras</groupId>
+         <artifactId>tycho-source-feature-plugin</artifactId>
+         <version>${tycho-version}</version>
+         <executions>
+           <execution>
+             <id>source-feature</id>
+             <phase>package</phase>
+             <goals>
+               <goal>source-feature</goal>
+             </goals>
+             <configuration>
+               <excludes>
+                 <plugin id="org.eclipse.linuxtools.tracing.rcp.branding"/>
+               </excludes>
+             </configuration>
+           </execution>
+         </executions>
+       </plugin>
+       <plugin>
+         <groupId>org.eclipse.tycho</groupId>
+         <artifactId>tycho-p2-plugin</artifactId>
+         <version>${tycho-version}</version>
+         <executions>
+           <execution>
+             <id>attached-p2-metadata</id>
+             <phase>package</phase>
+             <goals>
+               <goal>p2-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
+       </plugin>
+     </plugins>
+   </build>
+   
+ </project>

diff --cc org.eclipse.linuxtools.tracing.rcp.branding/pom.xml
index 0000000000000000000000000000000000000000,4587d3246c17294e1585bf0ec78df9e45f7b97f0..92ec51bcfea0873242b45d67918407ac6d9b27f3
mode 000000,100644..100644
--- /dev/null
--- 2/org.eclipse.linuxtools.tracing.rcp.branding/pom.xml
+++ b/org.eclipse.linuxtools.tracing.rcp.branding/pom.xml
@@@ -1,0 -1,17 +1,17 @@@
 -    <version>2.1.0-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+ 
+   <version>0.0.1-SNAPSHOT</version>
+   <artifactId>org.eclipse.linuxtools.tracing.rcp.branding</artifactId>
+   <packaging>eclipse-plugin</packaging>
+   <name>Linux Tools Trace Viewer Branding plug-in</name>
+ 
+   <parent>
++    <version>3.0.0-SNAPSHOT</version>
+     <groupId>org.eclipse.linuxtools.lttng</groupId>
+     <artifactId>linuxtools-lttng-parent</artifactId>
+   </parent>
+ 
+ </project>

diff --cc org.eclipse.linuxtools.tracing.rcp.product/tracing.product
index bd6beeb3c1ed9d97310af11ac8993a86a5d26da0,4ade3fa85fcb4d4acb306a74060fd16267999358..060a717b2d302996ddd7ef1f8a3777d2ba124e5e
--- 1/org.eclipse.linuxtools.tracing.rcp.product/tracing.product
--- 2/org.eclipse.linuxtools.tracing.rcp.product/tracing.product
+++ b/org.eclipse.linuxtools.tracing.rcp.product/tracing.product
@@@ -179,16 -179,11 +179,12 @@@ Java and all Java-based trademarks are 
     </plugins>
  
     <features>
+       <feature id="org.eclipse.linuxtools.tracing.rcp.branding.feature"/>
        <feature id="org.eclipse.linuxtools.tracing.rcp"/>
        <feature id="org.eclipse.linuxtools.lttng2.kernel"/>
 +      <feature id="org.eclipse.linuxtools.lttng2.ust"/>
        <feature id="org.eclipse.linuxtools.lttng2"/>
-       <feature id="org.eclipse.linuxtools.tmf"/>
-       <feature id="org.eclipse.linuxtools.ctf"/>
-       <feature id="org.eclipse.e4.rcp"/>
-       <feature id="org.eclipse.rse.ssh"/>
-       <feature id="org.eclipse.rse.core"/>
-       <feature id="org.eclipse.rse.ftp"/>
+       <feature id="org.eclipse.equinox.p2.core.feature"/>
        <feature id="org.eclipse.rse.local"/>
        <feature id="org.eclipse.rse.dstore"/>
        <feature id="org.eclipse.rse.telnet"/>

diff --cc pom.xml
Simple merge