Make test plugins fragments.
authorAlexander Kurtakov <akurtako@redhat.com>
Wed, 4 Apr 2012 15:10:40 +0000 (18:10 +0300)
committerAlexander Kurtakov <akurtako@redhat.com>
Wed, 4 Apr 2012 15:10:40 +0000 (18:10 +0300)
This gives them access to the full environment of the host. Activators
are removed as fragments can't have activators. The only usage of the
activators was to access the bundle which was replaced with calls to the
FrameworkUtil.

39 files changed:
org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/CtfCoreTestPlugin.java [deleted file]
org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java [deleted file]
org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java
org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java
org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java
org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java
org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java
org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java
org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java
org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java
org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java
org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/LTTngUITestPlugin.java [deleted file]
org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/Activator.java [deleted file]
org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/Activator.java [deleted file]
org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.kernel.ui.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/tests/Activator.java [deleted file]
org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/Activator.java [deleted file]
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java
org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java
org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java [deleted file]
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java

index f4639b19ad9b24f34277ebf5092ae790e0b7e7e0..476751309a621589d8810f77e3559ec8d47b2058 100644 (file)
@@ -5,9 +5,8 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.ctf.core.tests
-Bundle-Activator: org.eclipse.linuxtools.ctf.core.tests.CtfCoreTestPlugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.linuxtools.ctf.core
 Require-Bundle: org.junit4;bundle-version="4.8.1",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.linuxtools.ctf.core,
  org.antlr.runtime;bundle-version="3.2.0"
diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/CtfCoreTestPlugin.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/CtfCoreTestPlugin.java
deleted file mode 100644 (file)
index 388a9dc..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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
- * 
- * Contributors:
- *   Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.ctf.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <b><u>TmfCoreTestPlugin</u></b>
- * <p>
- * The activator class controls the plug-in life cycle
- */
-public class CtfCoreTestPlugin extends Plugin {
-
-    // ========================================================================
-    // Attributes
-    // ========================================================================
-
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.linuxtools.ctf.core.tests"; //$NON-NLS-1$
-
-    // The shared instance
-    private static CtfCoreTestPlugin plugin;
-
-    // ========================================================================
-    // Constructors
-    // ========================================================================
-
-    /**
-     * The constructor
-     */
-    public CtfCoreTestPlugin() {
-        plugin = this;
-    }
-
-    // ========================================================================
-    // Accessors
-    // ========================================================================
-
-    /**
-     * @return the shared instance
-     */
-    public static CtfCoreTestPlugin getPlugin() {
-        return plugin;
-    }
-
-    @Override
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-}
index f0d2a34643a64a16036a5c11da4cff5d3c17cfd6..1bd574c12a980f78115ad8720950e1cd4eafeab1 100644 (file)
@@ -16,5 +16,4 @@ Export-Package: org.eclipse.linuxtools.ctf.core.event,
  org.eclipse.linuxtools.ctf.core.event.metadata,
  org.eclipse.linuxtools.ctf.core.event.metadata.exceptions,
  org.eclipse.linuxtools.ctf.core.event.types,
- org.eclipse.linuxtools.ctf.core.trace,
- org.eclipse.linuxtools.internal.ctf.core
+ org.eclipse.linuxtools.ctf.core.trace
index 0ed93cd2c23d39a2c2e4696e6f6c93148a6df86d..df97ffa2d9a161f894dbef3f146763e38aad641f 100644 (file)
@@ -5,13 +5,12 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.5.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.core.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.linuxtools.lttng.jni
+Fragment-Host: org.eclipse.linuxtools.lttng.core
 Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.linuxtools.lttng.core;bundle-version="0.4.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
  org.eclipse.linuxtools.lttng.jni;bundle-version="0.4.0"
diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java
deleted file mode 100644 (file)
index 56daa84..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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
- * 
- * Contributors:
- *   Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <b><u>TmfCoreTestPlugin</u></b>
- * <p>
- * The activator class controls the plug-in life cycle
- */
-@SuppressWarnings("nls")
-public class LTTngCoreTestPlugin extends Plugin {
-
-    // ========================================================================
-    // Attributes
-    // ========================================================================
-
-       // The plug-in ID
-       public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.tests";
-
-       // The shared instance
-       private static LTTngCoreTestPlugin plugin;
-       
-    // ========================================================================
-    // Constructors
-    // ========================================================================
-
-       /**
-        * The constructor
-        */
-       public LTTngCoreTestPlugin() {
-               plugin = this;
-       }
-
-    // ========================================================================
-    // Accessors
-    // ========================================================================
-
-    /**
-     * @return the shared instance
-     */
-    public static LTTngCoreTestPlugin getPlugin() {
-        return plugin;
-    }
-    
-    @Override
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-}
index 55b4c8ed29997cce6ab7867b26c265957ca013e1..0cf3ad1dab7a663e5987bc458243952ae23c528d 100644 (file)
@@ -24,6 +24,7 @@ import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
 import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
 import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.osgi.framework.FrameworkUtil;
 
 @SuppressWarnings("nls")
 public abstract class LttngTestPreparation extends TestCase {
@@ -120,7 +121,7 @@ public abstract class LttngTestPreparation extends TestCase {
        protected LTTngTrace prepareStreamToTest() {
                if (frealStream == null) {
                        try {
-                               URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(ftracepath_T1),
+                               URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(ftracepath_T1),
                                                null);
                                File testfile = new File(FileLocator.toFileURL(location).toURI());
                                LTTngTrace tmpStream = new LTTngTrace(testfile.getName(), testfile.getPath(), false);
@@ -139,7 +140,7 @@ public abstract class LttngTestPreparation extends TestCase {
        protected LTTngTextTrace prepareTextStreamToTest() {
                if (ftextStream_T1 == null) {
                        try {
-                               URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(),
+                               URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()),
                                                new Path(fTextTracepath_T1), null);
                                File testfile = new File(FileLocator.toFileURL(location).toURI());
                                LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath());
index fc2e9c671964675ab9d49acd894b02d838dff4e8..c69a91021ef6a962e44d0296216d8244756e5e44 100644 (file)
@@ -14,10 +14,10 @@ import org.eclipse.linuxtools.internal.lttng.core.event.LttngEventField;
 import org.eclipse.linuxtools.internal.lttng.core.event.LttngEventType;
 import org.eclipse.linuxtools.internal.lttng.core.event.LttngTimestamp;
 import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.osgi.framework.FrameworkUtil;
 
 /*
  Functions tested here :
@@ -63,7 +63,7 @@ public class LttngEventContentTest extends TestCase {
     private LTTngTextTrace initializeEventStream() {
        if (testStream == null) {
                        try {
-                               URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+                               URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
                                File testfile = new File(FileLocator.toFileURL(location).toURI());
                                LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath());
                                testStream = tmpStream;
index 126f2be4bc7e218e893378d1c292e1be3d31d196..248cd6dc7b46239d6d28ddd7dfddd05bf176fe31 100644 (file)
@@ -11,9 +11,9 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.internal.lttng.core.event.LttngEventField;
 import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.osgi.framework.FrameworkUtil;
 
 /*
  Functions tested here :
@@ -35,7 +35,7 @@ public class LttngEventFieldTest extends TestCase {
     private LTTngTextTrace initializeEventStream() {
                if (testStream == null) {
                        try {
-                               URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+                               URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
                                File testfile = new File(FileLocator.toFileURL(location).toURI());
                                LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath(), skipIndexing);
                                testStream = tmpStream;
index 31254386cb067314bd8bddfdd4b4ba883dc04a18..57e9c2561f49e415aa82f890835982b806368365 100644 (file)
@@ -13,10 +13,10 @@ import org.eclipse.linuxtools.internal.lttng.core.event.LttngEventType;
 import org.eclipse.linuxtools.internal.lttng.core.event.LttngTimestamp;
 import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
 import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
 import org.eclipse.linuxtools.lttng.jni.JniEvent;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.osgi.framework.FrameworkUtil;
 
 /*
  Functions tested here :
@@ -57,7 +57,7 @@ public class LttngEventTest extends TestCase {
     private LTTngTextTrace initializeEventStream() {
                if (testStream == null) {
                        try {
-                               URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+                               URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
                                File testfile = new File(FileLocator.toFileURL(location).toURI());
                                LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath(), skipIndexing);
                                testStream = tmpStream;
index 6abd6a8be13eb3d680ec4cf96507d56ce28b8c31..49000a680a7150c5dc96c4e775d9f1adc4319012 100644 (file)
@@ -9,8 +9,8 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.internal.lttng.core.event.LttngEventType;
 import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.osgi.framework.FrameworkUtil;
 
 /*
  Functions tested here :
@@ -38,7 +38,7 @@ public class LttngEventTypeTest extends TestCase {
     private LTTngTextTrace initializeEventStream() {
                if (testStream == null) {
                        try {
-                               URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+                               URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
                                File testfile = new File(FileLocator.toFileURL(location).toURI());
                                LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath(), skipIndexing);
                                testStream = tmpStream;
index 5b027f2398d164c2c0253764f193d9c99304d5af..59107e2c53285fb78ead4bc3e7367f570900480c 100644 (file)
@@ -9,8 +9,8 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.internal.lttng.core.event.LttngTimestamp;
 import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.osgi.framework.FrameworkUtil;
 
 /*
  Functions tested here :
@@ -41,7 +41,7 @@ public class LttngTimestampTest extends TestCase {
     private LTTngTextTrace initializeEventStream() {
         if (testStream == null) {
             try {
-                URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+                URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
                 File testfile = new File(FileLocator.toFileURL(location).toURI());
                 LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath(), skipIndexing);
                 testStream = tmpStream;
index dae0e9ef6968882a56b8c4e396cbd2408fadd32b..b39a69b7e8384c6be5d4d5de1da5e898922d3b57 100644 (file)
@@ -23,11 +23,11 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.internal.lttng.core.event.LttngEvent;
 import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.osgi.framework.FrameworkUtil;
 
 /**
  * <b><u>TmfExperimentTest</u></b>
@@ -58,7 +58,7 @@ public class LTTngExperimentTest extends TestCase {
        if (fTraces == null) {
                fTraces = new ITmfTrace[1];
                try {
-                               URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(path), null);
+                               URL location = FileLocator.find(FrameworkUtil.getBundle(LTTngExperimentTest.class), new Path(path), null);
                                File testfile = new File(FileLocator.toFileURL(location).toURI());
                                LTTngTrace trace = new LTTngTrace(testfile.getName(), testfile.getPath(), false);
                        fTraces[0] = trace;
index 4f9957ef2fbdcae85e20b97877f4a6af67f67bb4..7ce28057bf0087680b215981e5adbf6ac717ce0c 100644 (file)
@@ -8,12 +8,12 @@ import junit.framework.TestCase;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.osgi.framework.FrameworkUtil;
 
 /*
  Functions tested here :
@@ -70,7 +70,7 @@ public class LTTngTextTraceTest extends TestCase {
     private synchronized LTTngTextTrace prepareStreamToTest() {
         if (testStream == null) {
             try {
-                URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+                URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
                 File testfile = new File(FileLocator.toFileURL(location).toURI());
                 LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath());
                 testStream = tmpStream;
index 977a337867740df6be5fd29f67e9b40d504e721b..1e8dbe102912c2b6b0a4ed9bf260f6c3d654cc93 100644 (file)
@@ -9,10 +9,10 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.internal.lttng.core.event.LttngLocation;
 import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTrace;
-import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.osgi.framework.FrameworkUtil;
 
 /*
  Functions tested here :
@@ -72,7 +72,7 @@ public class LTTngTraceTest extends TestCase {
     private LTTngTrace prepareStreamToTest() {
                if (testStream == null) {
                        try {
-                               URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+                               URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
                                File testfile = new File(FileLocator.toFileURL(location).toURI());
                                LTTngTrace tmpStream = new LTTngTrace(testfile.getName(), testfile.getPath(), false);
                                testStream = tmpStream;
@@ -102,7 +102,7 @@ public class LTTngTraceTest extends TestCase {
         
         // Test constructor with argument on a correct tracepath, skipping indexing
         try {
-            URL location = FileLocator.find(LTTngCoreTestPlugin.getPlugin().getBundle(), new Path(tracepath1), null);
+            URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
             File testfile = new File(FileLocator.toFileURL(location).toURI());
             new LTTngTrace(testfile.getName(), testfile.getPath(), skipIndexing);
         }
index 17d125146809caf719fd2786f12cfbff7fe4b751..dd546bd59714ed5ea67bd5b4d4c5c96e25c4b9d1 100644 (file)
@@ -14,25 +14,25 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.rse.core;bundle-version="3.2.0",
  org.eclipse.tm.tcf.core;bundle-version="0.4.0",
  org.eclipse.core.resources;bundle-version="3.7.100"
-Export-Package: org.eclipse.linuxtools.internal.lttng.core;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.control;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.event;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.exceptions;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.latency.analyzer;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.model;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.request;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.signal;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.state;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.experiment;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.model;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.resource;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.state.trace;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.trace;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.tracecontrol;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.core.util;x-friends:="org.eclipse.linuxtools.lttng.core.tests,org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests"
+Export-Package: org.eclipse.linuxtools.internal.lttng.core;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.control;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.event;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.exceptions;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.latency.analyzer;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.model;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.request;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.signal;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.evProcessor.state;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.experiment;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.model;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.resource;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.state.trace;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.trace;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.tracecontrol;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests",
+ org.eclipse.linuxtools.internal.lttng.core.util;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests"
index 392c603f4faaf040c39433e725318f48f69cecc4..ca5e9c6561560c2dc948986ae7b2f15e5b725bb8 100644 (file)
@@ -5,12 +5,11 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.5.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.ui.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng.ui.tests.LTTngUITestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.linuxtools.lttng.ui
 Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.linuxtools.lttng.core;bundle-version="0.4.0",
- org.eclipse.linuxtools.lttng.ui;bundle-version="0.4.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
  org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.0",
diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/LTTngUITestPlugin.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/LTTngUITestPlugin.java
deleted file mode 100644 (file)
index 60f587b..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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
- * 
- * Contributors:
- *   Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class LTTngUITestPlugin extends AbstractUIPlugin {
-
-       // The plug-in ID
-       public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.ui.tests"; //$NON-NLS-1$
-
-       // The shared instance
-       private static LTTngUITestPlugin plugin;
-       
-       // ------------------------------------------------------------------------
-       // Constructor
-       // ------------------------------------------------------------------------
-
-       public LTTngUITestPlugin() {
-       }
-
-       // ------------------------------------------------------------------------
-       // AbstractUIPlugin
-       // ------------------------------------------------------------------------
-
-       @Override
-       public void start(BundleContext context) throws Exception {
-               super.start(context);
-               plugin = this;
-       }
-
-       @Override
-       public void stop(BundleContext context) throws Exception {
-               plugin = null;
-               super.stop(context);
-       }
-
-       // ------------------------------------------------------------------------
-       // Accessors
-       // ------------------------------------------------------------------------
-
-       public static LTTngUITestPlugin getDefault() {
-               return plugin;
-       }
-
-}
index 47b83ddee537785e33c4f081050c32adf6fe1ec3..b5b5c92c3a2e69d925bb9a75a79afeab28eb902e 100644 (file)
@@ -21,33 +21,3 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100",
  org.eclipse.rse.ui;bundle-version="3.2.0",
  org.eclipse.linuxtools.lttng.core;bundle-version="0.4.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng.ui;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.model.trange;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.connectorservice;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.utility;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.common;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.controlflow;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.distribution.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.events;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.latency;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.latency.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.latency.listeners;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.latency.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.resources;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.resources.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.resources.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.statistics;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.statistics.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.statistics.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
- org.eclipse.linuxtools.internal.lttng.ui.views.timeframe;x-friends:="org.eclipse.linuxtools.lttng.ui.tests"
-
index 66210b1922d7018bbb567f71f31f5828dc79b49c..71427360374e84f2c6851d223f90395602f880ac 100644 (file)
@@ -5,9 +5,9 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng2.core.tests.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.linuxtools.lttng2.core
 Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100"
diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/Activator.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/Activator.java
deleted file mode 100644 (file)
index 229e6c2..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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
- * 
- * Contributors:
- *   Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng2.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <b><u>Activator</u></b>
- * <p>
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-    // ------------------------------------------------------------------------
-    // Attributes
-    // ------------------------------------------------------------------------
-
-    /**
-     *  The plug-in ID
-     */
-    public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.core.tests"; //$NON-NLS-1$
-
-    /**
-     *  The shared instance
-     */
-    private static Activator plugin;
-    
-    // ------------------------------------------------------------------------
-    // Constructors
-    // ------------------------------------------------------------------------
-
-    /**
-     * The constructor
-     */
-    public Activator() {
-    }
-
-    // ------------------------------------------------------------------------
-    // Accessors
-    // ------------------------------------------------------------------------
-
-    /**
-     * Returns the shared instance
-     *
-     * @return the shared instance
-     */
-    public static Activator getDefault() {
-        return plugin;
-    }
-
-    // ------------------------------------------------------------------------
-    // Operators
-    // ------------------------------------------------------------------------
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-}
index 893cd6427552b5293f166fb1b425ae0618abc441..279fea1e8d6dcfdd655e4af2a5ea9b6474106d93 100644 (file)
@@ -9,4 +9,3 @@ Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.core.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng2.core;x-friends:="org.eclipse.linuxtools.lttng2.core.tests"
index dadc72da98e4f3f8f4f71d737066532b69078b3e..a2f0dfd7cfe19dcb462a8bdbc24d3cc2b822c937 100644 (file)
@@ -5,11 +5,10 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.core.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng2.kernel.core.tests.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.linuxtools.lttng2.kernel.core
 Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="0.1.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0"
diff --git a/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/Activator.java b/org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/Activator.java
deleted file mode 100644 (file)
index 559e79d..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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
- * 
- * Contributors:
- *   Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng2.kernel.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <b><u>Activator</u></b>
- * <p>
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-    // ------------------------------------------------------------------------
-    // Attributes
-    // ------------------------------------------------------------------------
-
-    /**
-     *  The plug-in ID
-     */
-    public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.kernel.core.tests"; //$NON-NLS-1$
-
-    /**
-     *  The shared instance
-     */
-    private static Activator plugin;
-    
-    // ------------------------------------------------------------------------
-    // Constructors
-    // ------------------------------------------------------------------------
-
-    /**
-     * The constructor
-     */
-    public Activator() {
-    }
-
-    // ------------------------------------------------------------------------
-    // Accessors
-    // ------------------------------------------------------------------------
-
-    /**
-     * Returns the shared instance
-     *
-     * @return the shared instance
-     */
-    public static Activator getDefault() {
-        return plugin;
-    }
-
-    // ------------------------------------------------------------------------
-    // Operators
-    // ------------------------------------------------------------------------
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-}
index 08d0a4d0039b0a3ffa82179fa335a690a829cc04..ec8d28556f887fcdf02a905a289fee5f5d00a774 100644 (file)
@@ -10,5 +10,3 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.core;x-friends:="org.eclipse.linuxtools.lttng2.kernel.core.tests",
- org.eclipse.linuxtools.internal.lttng2.kernel.core.stateprovider;x-friends:="org.eclipse.linuxtools.lttng2.kernel.core.tests"
index 3ac45ecfd5c4f9955183243b91d404ca70d59f90..d791c9b4ce71c145af5f66df99d6913070ec9ea9 100644 (file)
@@ -5,9 +5,9 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.ui.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng2.kernel.ui.tests.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.linuxtools.lttng2.kernel.ui
 Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.linuxtools.lttng2.core;bundle-version="0.1.0",
  org.eclipse.linuxtools.lttng2.ui;bundle-version="0.1.0",
diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/tests/Activator.java b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/tests/Activator.java
deleted file mode 100644 (file)
index 6586643..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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
- * 
- * Contributors:
- *   Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng2.kernel.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-    // ------------------------------------------------------------------------
-    // Attributes
-    // ------------------------------------------------------------------------
-
-    /**
-     *  The plug-in ID
-     */
-    public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.kernel.ui.tests"; //$NON-NLS-1$
-
-    /**
-     *  The shared instance
-     */
-    private static Activator plugin;
-
-    // ------------------------------------------------------------------------
-    // Constructors
-    // ------------------------------------------------------------------------
-
-    /**
-     * The constructor
-     */
-    public Activator() {
-    }
-
-    // ------------------------------------------------------------------------
-    // Accessors
-    // ------------------------------------------------------------------------
-
-    /**
-     * Returns the shared instance
-     *
-     * @return the shared instance
-     */
-    public static Activator getDefault() {
-        return plugin;
-    }
-
-    // ------------------------------------------------------------------------
-    // AbstractUIPlugin
-    // ------------------------------------------------------------------------
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-}
\ No newline at end of file
index d6ade7d75e7759d7d971587819a2d77c392a2597..9643e2f82fd9f57dab143f8c7d93d2c64137e976 100644 (file)
@@ -5,16 +5,7 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui.tests
-Bundle-Activator: org.eclipse.linuxtools.lttng2.ui.tests.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit;bundle-version="3.8.2",
- org.eclipse.linuxtools.lttng2.core;bundle-version="0.1.0",
- org.eclipse.linuxtools.lttng2.ui;bundle-version="0.1.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.ui.views;bundle-version="3.6.0",
- org.eclipse.rse.core;bundle-version="3.2.0",
- org.eclipse.rse.services;bundle-version="3.2.100",
- org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100"
+Fragment-Host: org.eclipse.linuxtools.lttng2.ui
+Require-Bundle: org.junit;bundle-version="3.8.2"
diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/Activator.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/Activator.java
deleted file mode 100644 (file)
index 6c2b210..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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
- * 
- * Contributors:
- *   Francois Chouinard - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng2.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-    // ------------------------------------------------------------------------
-    // Attributes
-    // ------------------------------------------------------------------------
-
-    /**
-     *  The plug-in ID
-     */
-    public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.ui.tests"; //$NON-NLS-1$
-
-    /**
-     *  The shared instance
-     */
-    private static Activator plugin;
-
-    // ------------------------------------------------------------------------
-    // Constructors
-    // ------------------------------------------------------------------------
-
-    /**
-     * The constructor
-     */
-    public Activator() {
-    }
-
-    // ------------------------------------------------------------------------
-    // Accessors
-    // ------------------------------------------------------------------------
-
-    /**
-     * Returns the shared instance
-     *
-     * @return the shared instance
-     */
-    public static Activator getDefault() {
-        return plugin;
-    }
-
-    // ------------------------------------------------------------------------
-    // AbstractUIPlugin
-    // ------------------------------------------------------------------------
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-}
\ No newline at end of file
index 567ec7c906112e3a7e1eff34b90704e25af60e76..2f0bf7465e2e16ba6664ff195930967746b6354d 100644 (file)
@@ -37,12 +37,12 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.Target
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent;
-import org.eclipse.linuxtools.lttng2.ui.tests.Activator;
 import org.eclipse.rse.core.model.Host;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.internal.core.model.SystemProfile;
 import org.junit.After;
 import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
 
 /**
  * The class <code>TraceControlKernelProviderTests</code> contains UST provider handling
@@ -92,7 +92,7 @@ public class TraceControlKernelProviderTests extends TestCase {
     public void setUp() throws Exception {
         fFacility = TraceControlTestFacility.getInstance();
         fProxy = new TestRemoteSystemProxy();
-        URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
+        URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
         File testfile = new File(FileLocator.toFileURL(location).toURI());
         fTestFile = testfile.getAbsolutePath();
     }
index 0ff1d56641b126ef307dbbce40fcb24d603a4a6e..cdb2969a53fac83784ac8a48bf67e7d6fd143d86 100644 (file)
@@ -41,12 +41,12 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceC
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProbeEventComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent;
-import org.eclipse.linuxtools.lttng2.ui.tests.Activator;
 import org.eclipse.rse.core.model.Host;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.internal.core.model.SystemProfile;
 import org.junit.After;
 import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
 
 /**
  * The class <code>TraceControlKernelSessionTests</code> contains UST session/channel/event
@@ -97,7 +97,7 @@ public class TraceControlKernelSessionTests extends TestCase {
     public void setUp() throws Exception {
         fFacility = TraceControlTestFacility.getInstance();
         fProxy = new TestRemoteSystemProxy();
-        URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
+        URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
         File testfile = new File(FileLocator.toFileURL(location).toURI());
         fTestFile = testfile.getAbsolutePath();
     }
index 964559dfab72762ff5840c4354f615cc75e7f339..bf0687e984e9aef9c12da22084778f839d4feb01 100644 (file)
@@ -46,13 +46,13 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceEve
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceProbeEventPropertySource;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceSessionPropertySource;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.UstProviderPropertySource;
-import org.eclipse.linuxtools.lttng2.ui.tests.Activator;
 import org.eclipse.rse.core.model.Host;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.internal.core.model.SystemProfile;
 import org.eclipse.ui.views.properties.IPropertySource;
 import org.junit.After;
 import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
 
 
 /**
@@ -122,7 +122,7 @@ public class TraceControlPropertiesTest extends TestCase {
         
         TestRemoteSystemProxy proxy = new TestRemoteSystemProxy();
 
-        URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null);
+        URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(DIRECTORY + File.separator + TEST_STREAM), null);
         File testfile = new File(FileLocator.toFileURL(location).toURI());
         proxy.setTestFile(testfile.getAbsolutePath());
         proxy.setScenario(SCEN_LIST_INFO_TEST);
index 5a8ac9d9e3844a7b213a1b701af44ab8230c6726..dcb50f90f8ec2ee738e3af6bd2193c84392ad2c0 100644 (file)
@@ -39,13 +39,13 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceS
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlService;
-import org.eclipse.linuxtools.lttng2.ui.tests.Activator;
 import org.eclipse.rse.core.model.Host;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.internal.core.model.SystemProfile;
 import org.eclipse.swt.graphics.Image;
 import org.junit.After;
 import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
 
 /**
  * The class <code>TraceControlTreeModelTest</code> contains tests for the tree component classes.
@@ -94,7 +94,7 @@ public class TraceControlTreeModelTest extends TestCase {
     @Before
     public void setUp() throws Exception {
         fProxy = new TestRemoteSystemProxy();
-        URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
+        URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
         File testfile = new File(FileLocator.toFileURL(location).toURI());
         fTestFile = testfile.getAbsolutePath();
     }
index e27ae6e8327cf5ef84cfacda510891289f885c0e..0994ffe057df5d6e9b66ce8916482b1fb5b24c06 100644 (file)
@@ -39,12 +39,12 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceC
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent;
-import org.eclipse.linuxtools.lttng2.ui.tests.Activator;
 import org.eclipse.rse.core.model.Host;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.internal.core.model.SystemProfile;
 import org.junit.After;
 import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
 
 /**
  * The class <code>TraceControlUstProviderTests</code> contains UST provider handling
@@ -94,7 +94,7 @@ public class TraceControlUstProviderTests extends TestCase {
     public void setUp() throws Exception {
         fFacility = TraceControlTestFacility.getInstance();
         fProxy = new TestRemoteSystemProxy();
-        URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
+        URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
         File testfile = new File(FileLocator.toFileURL(location).toURI());
         fTestFile = testfile.getAbsolutePath();
     }
index 9906fa49101f4b1024ba6a990a5ba7f19760574c..5b6d3206304691d1e295d846af18855de0a9d5b6 100644 (file)
@@ -41,12 +41,12 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.Target
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent;
-import org.eclipse.linuxtools.lttng2.ui.tests.Activator;
 import org.eclipse.rse.core.model.Host;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.internal.core.model.SystemProfile;
 import org.junit.After;
 import org.junit.Before;
+import org.osgi.framework.FrameworkUtil;
 
 /**
  * The class <code>TraceControlUstSessionTests</code> contains UST session/channel/event
@@ -96,7 +96,7 @@ public class TraceControlUstSessionTests extends TestCase {
     public void setUp() throws Exception {
         fFacility = TraceControlTestFacility.getInstance();
         fProxy = new TestRemoteSystemProxy();
-        URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
+        URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(TraceControlTestFacility.DIRECTORY + File.separator + TEST_STREAM), null);
         File testfile = new File(FileLocator.toFileURL(location).toURI());
         fTestFile = testfile.getAbsolutePath();
     }
index 9da01c692bb6a1ec6a6d430e80eee340eabc892b..c8a2bdaba7a5ce0769143543fac291f0f909ff7d 100644 (file)
@@ -38,7 +38,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessio
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ChannelInfo;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService;
 import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlService;
-import org.eclipse.linuxtools.lttng2.ui.tests.Activator;
+import org.osgi.framework.FrameworkUtil;
 /**
  * The class <code>LTTngControlServiceTest</code> contains test for the class <code>{@link  LTTngControlService}</code>.
  */
@@ -90,7 +90,7 @@ public class LTTngControlServiceTest extends TestCase {
         super.setUp();
         fShellFactory = CommandShellFactory.getInstance();
 
-        URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null);
+        URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(DIRECTORY + File.separator + TEST_STREAM), null);
         File testfile = new File(FileLocator.toFileURL(location).toURI());
         fTestfile = testfile.getAbsolutePath();
         
index 00d63cab894874b516a9af32b810172c0e28d88b..ef33b22feca30d8d8b84e319fe1c6b8e46fe3d97 100644 (file)
@@ -19,12 +19,3 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.rse.services;bundle-version="3.2.100",
  org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100",
  org.eclipse.rse.ui;bundle-version="3.2.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng2.ui;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.model;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.property;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ui.views.control.service;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests"
index df1b29cbfb683c0d16c9bf388125837dc642b48c..2b4a9cef4b9a7f1fe56853ed8d767c7f126a9fde 100644 (file)
@@ -5,7 +5,6 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.5.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui.tests;singleton:=true
-Bundle-Activator: org.eclipse.linuxtools.tmf.ui.tests.TmfUITestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="3.8.2",
diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java
deleted file mode 100644 (file)
index c2596c6..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************\r
- * Copyright (c) 2009, 2010 Ericsson\r
- * \r
- * All rights reserved. This program and the accompanying materials are\r
- * made available under the terms of the Eclipse Public License v1.0 which\r
- * accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- * \r
- * Contributors:\r
- *   Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation\r
- *******************************************************************************/\r
-package org.eclipse.linuxtools.tmf.ui.tests;\r
-\r
-import org.eclipse.jface.resource.ImageDescriptor;\r
-import org.eclipse.ui.plugin.AbstractUIPlugin;\r
-import org.osgi.framework.BundleContext;\r
-\r
-/**\r
- * The activator class controls the plug-in life cycle\r
- */\r
-@SuppressWarnings("nls")\r
-public class TmfUITestPlugin extends AbstractUIPlugin {\r
-\r
-       // The plug-in ID\r
-       public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf.ui.tests";\r
-\r
-       // The shared instance\r
-       private static TmfUITestPlugin plugin;\r
-       \r
-       // ========================================================================\r
-       // Constructor\r
-       // ========================================================================\r
-       public TmfUITestPlugin() {\r
-       }\r
-\r
-       // ========================================================================\r
-       // Methods\r
-       // ========================================================================\r
-       /*\r
-        * (non-Javadoc)\r
-        * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)\r
-        */\r
-       @Override\r
-       public void start(BundleContext context) throws Exception {\r
-               super.start(context);\r
-               plugin = this;\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)\r
-        */\r
-       @Override\r
-       public void stop(BundleContext context) throws Exception {\r
-               plugin = null;\r
-               super.stop(context);\r
-       }\r
-\r
-       /**\r
-        * Returns the shared instance\r
-        *\r
-        * @return the shared instance\r
-        */\r
-       public static TmfUITestPlugin getDefault() {\r
-               return plugin;\r
-       }\r
-\r
-       /**\r
-        * Returns an image descriptor for the image file at the given\r
-        * plug-in relative path\r
-        *\r
-        * @param path the path\r
-        * @return the image descriptor\r
-        */\r
-       public static ImageDescriptor getImageDescriptor(String path) {\r
-               return imageDescriptorFromPlugin(PLUGIN_ID, path);\r
-       }\r
-}\r
index 3d98b666597c500cc120823f9c3270e8c3b5dfed..21e4202b960413490a654065394870b773b84f5b 100644 (file)
@@ -27,7 +27,6 @@ import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser;
 import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
 import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub;
-import org.eclipse.linuxtools.tmf.ui.tests.TmfUITestPlugin;
 import org.eclipse.linuxtools.tmf.ui.tests.uml2sd.trace.TmfUml2SDTestTrace;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.widgets.Criteria;
@@ -39,6 +38,7 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.FrameworkUtil;
 
 /**
  *  Singleton class to facilitate the test cases. Creates UML2SD view and loader objects as well as provides
@@ -123,7 +123,7 @@ public class Uml2SDTestFacility {
         
             try {
                 // Create test trace object
-                URL location = FileLocator.find(TmfUITestPlugin.getDefault().getBundle(), new Path("tracesets/sdEvents"), null); //$NON-NLS-1$
+                URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path("tracesets/sdEvents"), null); //$NON-NLS-1$
                 File test = new File(FileLocator.toFileURL(location).toURI());
                 return new TmfTraceStub(test.getPath(), 500, true, parser);
             } catch (URISyntaxException e) {
This page took 0.05397 seconds and 5 git commands to generate.