From c9b530b04a7fec170343c5c69e9cc13a84c54c39 Mon Sep 17 00:00:00 2001
From: Francois Chouinard <fchouinard@gmail.com>
Date: Fri, 9 Mar 2012 14:42:32 -0500
Subject: [PATCH] Fix pom.xml:s

---
 .../plugin.properties                                  |  2 +-
 org.eclipse.linuxtools.lttng.core.tests/pom.xml        |  2 +-
 org.eclipse.linuxtools.lttng.core/plugin.properties    |  2 +-
 org.eclipse.linuxtools.lttng.core/pom.xml              |  2 +-
 org.eclipse.linuxtools.lttng.help/plugin.properties    |  2 +-
 org.eclipse.linuxtools.lttng.jni/plugin.properties     |  2 +-
 org.eclipse.linuxtools.lttng.jni/pom.xml               |  2 +-
 .../plugin.properties                                  |  2 +-
 org.eclipse.linuxtools.lttng.ui.tests/pom.xml          |  2 +-
 org.eclipse.linuxtools.lttng.ui/plugin.properties      |  2 +-
 org.eclipse.linuxtools.lttng.ui/pom.xml                |  2 +-
 org.eclipse.linuxtools.lttng/feature.properties        |  2 +-
 org.eclipse.linuxtools.lttng/pom.xml                   |  2 +-
 .../build.properties                                   |  4 +---
 .../pom.xml                                            |  2 +-
 org.eclipse.linuxtools.lttng2.kernel.core/pom.xml      |  2 +-
 org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml  |  2 +-
 org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml        |  2 +-
 org.eclipse.linuxtools.lttng2.kernel/pom.xml           |  2 +-
 .../build.properties                                   |  3 +--
 pom.xml                                                | 10 ++++++++++
 21 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/org.eclipse.linuxtools.lttng.core.tests/plugin.properties b/org.eclipse.linuxtools.lttng.core.tests/plugin.properties
index eab88dc1ee..3b08473d6a 100644
--- a/org.eclipse.linuxtools.lttng.core.tests/plugin.properties
+++ b/org.eclipse.linuxtools.lttng.core.tests/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.lttng.tests
 Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = LTTng Core Unit Test Suite
\ No newline at end of file
+Bundle-Name = LTTng Core Unit Test Suite (legacy)
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.lttng.core.tests/pom.xml b/org.eclipse.linuxtools.lttng.core.tests/pom.xml
index 146a5c84b0..9f3db96c6c 100644
--- a/org.eclipse.linuxtools.lttng.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng.core.tests/pom.xml
@@ -21,7 +21,7 @@
   <version>0.5.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>Linux Tools LTTng Core Unit Test Suite</name>
+  <name>Linux Tools LTTng Core Unit Test Suite (legacy)</name>
 
  <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/org.eclipse.linuxtools.lttng.core/plugin.properties b/org.eclipse.linuxtools.lttng.core/plugin.properties
index 0c06ede4f6..58820bc67d 100644
--- a/org.eclipse.linuxtools.lttng.core/plugin.properties
+++ b/org.eclipse.linuxtools.lttng.core/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.lttng
 Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = LTTng Core
\ No newline at end of file
+Bundle-Name = LTTng Core (legacy)
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.lttng.core/pom.xml b/org.eclipse.linuxtools.lttng.core/pom.xml
index 5ac515f82a..5c216cd2bd 100644
--- a/org.eclipse.linuxtools.lttng.core/pom.xml
+++ b/org.eclipse.linuxtools.lttng.core/pom.xml
@@ -21,7 +21,7 @@
   <version>0.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>Linux Tools LTTng Core Plug-in</name>
+  <name>Linux Tools LTTng Core Plug-in (legacy)</name>
 
  <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/org.eclipse.linuxtools.lttng.help/plugin.properties b/org.eclipse.linuxtools.lttng.help/plugin.properties
index 10ae7e1f2f..5e5e4beeaa 100644
--- a/org.eclipse.linuxtools.lttng.help/plugin.properties
+++ b/org.eclipse.linuxtools.lttng.help/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.lttng.help
 Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = LTTng Help
\ No newline at end of file
+Bundle-Name = LTTng Help (legacy)
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.lttng.jni/plugin.properties b/org.eclipse.linuxtools.lttng.jni/plugin.properties
index 8a6605c68c..2f809079a3 100644
--- a/org.eclipse.linuxtools.lttng.jni/plugin.properties
+++ b/org.eclipse.linuxtools.lttng.jni/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.lttng.jni
 Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = LTTng JNI
\ No newline at end of file
+Bundle-Name = LTTng JNI (legacy)
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.lttng.jni/pom.xml b/org.eclipse.linuxtools.lttng.jni/pom.xml
index ee74909524..a01272b88b 100644
--- a/org.eclipse.linuxtools.lttng.jni/pom.xml
+++ b/org.eclipse.linuxtools.lttng.jni/pom.xml
@@ -21,7 +21,7 @@
   <version>0.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>Linux Tools LTTng JNI Plug-in</name>
+  <name>Linux Tools LTTng JNI Plug-in (legacy)</name>
 
  <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/org.eclipse.linuxtools.lttng.ui.tests/plugin.properties b/org.eclipse.linuxtools.lttng.ui.tests/plugin.properties
index 671a585cef..a908341263 100644
--- a/org.eclipse.linuxtools.lttng.ui.tests/plugin.properties
+++ b/org.eclipse.linuxtools.lttng.ui.tests/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.lttng.ui.tests
 Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = LTTng UI Unit Test Suite
\ No newline at end of file
+Bundle-Name = LTTng UI Unit Test Suite (legacy)
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.lttng.ui.tests/pom.xml b/org.eclipse.linuxtools.lttng.ui.tests/pom.xml
index 2055707376..e5a6a51171 100644
--- a/org.eclipse.linuxtools.lttng.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng.ui.tests/pom.xml
@@ -21,7 +21,7 @@
   <version>0.5.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>Linux Tools LTTng UI Unit Test Suite</name>
+  <name>Linux Tools LTTng UI Unit Test Suite (legacy)</name>
 
  <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.properties b/org.eclipse.linuxtools.lttng.ui/plugin.properties
index d7b5eefcf8..d8683ca449 100644
--- a/org.eclipse.linuxtools.lttng.ui/plugin.properties
+++ b/org.eclipse.linuxtools.lttng.ui/plugin.properties
@@ -1,5 +1,5 @@
 #Properties file for org.eclipse.linuxtools.lttng.ui
-Bundle-Name = LTTng UI
+Bundle-Name = LTTng UI (legacy)
 Bundle-Vendor = Eclipse Linux Tools
 
 #Properties file for org.eclipse.linuxtools.tmf.ui (plugin.xml)
diff --git a/org.eclipse.linuxtools.lttng.ui/pom.xml b/org.eclipse.linuxtools.lttng.ui/pom.xml
index 0526d583f0..75dd6c17cb 100644
--- a/org.eclipse.linuxtools.lttng.ui/pom.xml
+++ b/org.eclipse.linuxtools.lttng.ui/pom.xml
@@ -21,7 +21,7 @@
   <version>0.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>Linux Tools LTTng UI Plug-in</name>
+  <name>Linux Tools LTTng UI Plug-in (legacy)</name>
 
  <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/org.eclipse.linuxtools.lttng/feature.properties b/org.eclipse.linuxtools.lttng/feature.properties
index 3cad903448..c1a4f9c262 100644
--- a/org.eclipse.linuxtools.lttng/feature.properties
+++ b/org.eclipse.linuxtools.lttng/feature.properties
@@ -9,7 +9,7 @@
 #    Ericsson - initial API and implementation
 #********************************************************************************
 
-featureName=LTTng - Linux Tracing Toolkit (Incubation)
+featureName=LTTng - Linux Tracing Toolkit (legacy)
 
 description=Plugins to integrate LTTng tools into the workbench.
 
diff --git a/org.eclipse.linuxtools.lttng/pom.xml b/org.eclipse.linuxtools.lttng/pom.xml
index ecf48b1975..a924d13a94 100644
--- a/org.eclipse.linuxtools.lttng/pom.xml
+++ b/org.eclipse.linuxtools.lttng/pom.xml
@@ -21,7 +21,7 @@
   <version>0.5.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
-  <name>Linux Tools LTTng (Linux Tracing Toolkit)</name>
+  <name>Linux Tools LTTng (legacy)</name>
 
   <groupId>org.eclipse.linuxtools.lttng</groupId>
   
diff --git a/org.eclipse.linuxtools.lttng2.core.tests/build.properties b/org.eclipse.linuxtools.lttng2.core.tests/build.properties
index d9271d71bb..aa1a008269 100644
--- a/org.eclipse.linuxtools.lttng2.core.tests/build.properties
+++ b/org.eclipse.linuxtools.lttng2.core.tests/build.properties
@@ -2,6 +2,4 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.properties,\
-               traceset/,\
-               test.xml
+               plugin.properties
diff --git a/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml b/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml
index 777eb673b0..f0a774ad57 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml
@@ -21,7 +21,7 @@
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>Linux Tools LTTng Core Unit Test Suite</name>
+  <name>Linux Tools LTTng Kernel Analysis Core Unit Test Suite</name>
 
  <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml b/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml
index 788f993493..ea9c80fcd0 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml
@@ -21,7 +21,7 @@
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>Linux Tools LTTng Core Plug-in</name>
+  <name>Linux Tools LTTng Kernel Analysis Core</name>
 
  <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
index 34a3cfe28e..3674c4a970 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
@@ -21,7 +21,7 @@
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>Linux Tools LTTng UI Unit Test Suite</name>
+  <name>Linux Tools LTTng Kernel Analysis UI Unit Test Suite</name>
 
  <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml b/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml
index d72ae1c632..5a534fa2e9 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml
@@ -21,7 +21,7 @@
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
-  <name>Linux Tools LTTng UI Plug-in</name>
+  <name>Linux Tools LTTng Kernel Analysis UI Plug-in</name>
 
  <build>
      <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
diff --git a/org.eclipse.linuxtools.lttng2.kernel/pom.xml b/org.eclipse.linuxtools.lttng2.kernel/pom.xml
index 1db38c9b71..3a11784bdd 100644
--- a/org.eclipse.linuxtools.lttng2.kernel/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel/pom.xml
@@ -21,7 +21,7 @@
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
-  <name>Linux Tools LTTng Kernal Analysis</name>
+  <name>Linux Tools LTTng Kernel Analysis</name>
 
   <groupId>org.eclipse.linuxtools.lttng</groupId>
   
diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/build.properties b/org.eclipse.linuxtools.lttng2.ui.tests/build.properties
index 33230c0457..aa1a008269 100644
--- a/org.eclipse.linuxtools.lttng2.ui.tests/build.properties
+++ b/org.eclipse.linuxtools.lttng2.ui.tests/build.properties
@@ -2,5 +2,4 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.properties,\
-               test.xml
+               plugin.properties
diff --git a/pom.xml b/pom.xml
index c1b6a28da3..edad957791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,16 @@
     <module>org.eclipse.linuxtools.lttng.ui.tests</module>
 
     <module>org.eclipse.linuxtools.lttng2</module>
+    <module>org.eclipse.linuxtools.lttng2.core</module>
+    <module>org.eclipse.linuxtools.lttng2.core.tests</module>
+    <module>org.eclipse.linuxtools.lttng2.ui</module>
+    <module>org.eclipse.linuxtools.lttng2.ui.tests</module>
+
+    <module>org.eclipse.linuxtools.lttng2.kernel</module>
+    <module>org.eclipse.linuxtools.lttng2.kernel.core</module>
+    <module>org.eclipse.linuxtools.lttng2.kernel.core.tests</module>
+    <module>org.eclipse.linuxtools.lttng2.kernel.ui</module>
+    <module>org.eclipse.linuxtools.lttng2.kernel.ui.tests</module>
   </modules>
 
 </project>
-- 
2.34.1