From a74d2fdeadcd948d6206541fbf7779e70e72f6e7 Mon Sep 17 00:00:00 2001
From: Francois Chouinard <fchouinard@gmail.com>
Date: Fri, 15 Jan 2010 16:44:48 +0000
Subject: [PATCH] [156247] Preparation work for LTTng/TMF automated testing in
 Linux Tools build system.

---
 .../feature.xml                                |  8 ++++++++
 .../build.properties                           |  3 ++-
 org.eclipse.linuxtools.lttng/plugin.properties |  2 +-
 .../eclipse/linuxtools/lttng/TraceDebug.java   | 18 ++++++++++++++++++
 .../lttng/state/StateStacksHandler.java        |  2 +-
 org.eclipse.linuxtools.tmf-feature/feature.xml |  6 ++++++
 .../build.properties                           |  3 ++-
 org.eclipse.linuxtools.tmf/plugin.properties   |  2 +-
 8 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/org.eclipse.linuxtools.lttng-feature/feature.xml b/org.eclipse.linuxtools.lttng-feature/feature.xml
index 05a8a4c4a6..46f1c0f1fd 100644
--- a/org.eclipse.linuxtools.lttng-feature/feature.xml
+++ b/org.eclipse.linuxtools.lttng-feature/feature.xml
@@ -20,6 +20,14 @@
 
    <requires>
       <import feature="org.eclipse.linuxtools.tmf" version="0.2.0.qualifier" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.linuxtools.tmf" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.ui" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng" version="0.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.linuxtools.lttng.ui.tests/build.properties b/org.eclipse.linuxtools.lttng.ui.tests/build.properties
index aa1a008269..33230c0457 100644
--- a/org.eclipse.linuxtools.lttng.ui.tests/build.properties
+++ b/org.eclipse.linuxtools.lttng.ui.tests/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.properties
+               plugin.properties,\
+               test.xml
diff --git a/org.eclipse.linuxtools.lttng/plugin.properties b/org.eclipse.linuxtools.lttng/plugin.properties
index 8ac8e39197..da1d0fbac8 100644
--- a/org.eclipse.linuxtools.lttng/plugin.properties
+++ b/org.eclipse.linuxtools.lttng/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.lttng
 Bundle-Vendor = Eclipse
-Bundle-Name = Linux Tracing Toolkit (LTTng)
\ No newline at end of file
+Bundle-Name = LTTng - Linux Tracing Toolkit (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java
index 59588eefa7..96eb50dd49 100644
--- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java
+++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java
@@ -116,6 +116,24 @@ public class TraceDebug {
 		return null;
 	}
 
+	public static boolean setDEBUG(boolean newValue) {
+		boolean oldValue = DEBUG;
+		DEBUG = newValue;
+		return oldValue;
+	}
+
+	public static boolean setINFO(boolean newValue) {
+		boolean oldValue = INFO;
+		INFO = newValue;
+		return oldValue;
+	}
+
+	public static boolean setWARN(boolean newValue) {
+		boolean oldValue = WARN;
+		WARN = newValue;
+		return oldValue;
+	}
+
 	public static boolean isDEBUG() {
 		return DEBUG;
 	}
diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java
index 04964f70ce..81ad12f298 100644
--- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java
+++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java
@@ -66,7 +66,7 @@ public class StateStacksHandler {
 	}
 
 
-	void processEvent(TmfEvent tmfEvent) /* throws LttngStateException */{
+	protected void processEvent(TmfEvent tmfEvent) /* throws LttngStateException */{
 		if (tmfEvent == null) {
 			return;
 		}
diff --git a/org.eclipse.linuxtools.tmf-feature/feature.xml b/org.eclipse.linuxtools.tmf-feature/feature.xml
index 1374a505d2..89c014cf43 100644
--- a/org.eclipse.linuxtools.tmf-feature/feature.xml
+++ b/org.eclipse.linuxtools.tmf-feature/feature.xml
@@ -17,6 +17,12 @@
       %license
    </license>
 
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.linuxtools.tmf" version="0.2.0" match="greaterOrEqual"/>
+   </requires>
+
    <plugin
          id="org.eclipse.linuxtools.tmf"
          download-size="0"
diff --git a/org.eclipse.linuxtools.tmf.ui.tests/build.properties b/org.eclipse.linuxtools.tmf.ui.tests/build.properties
index aa1a008269..33230c0457 100644
--- a/org.eclipse.linuxtools.tmf.ui.tests/build.properties
+++ b/org.eclipse.linuxtools.tmf.ui.tests/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.properties
+               plugin.properties,\
+               test.xml
diff --git a/org.eclipse.linuxtools.tmf/plugin.properties b/org.eclipse.linuxtools.tmf/plugin.properties
index b4c214aa72..7e2b3cb979 100644
--- a/org.eclipse.linuxtools.tmf/plugin.properties
+++ b/org.eclipse.linuxtools.tmf/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.tmf
 Bundle-Vendor = Eclipse
-Bundle-Name = Tracing and Monitoring Framework (TMF)
\ No newline at end of file
+Bundle-Name = TMF - Tracing and Monitoring Framework (Incubation)
\ No newline at end of file
-- 
2.34.1