Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Chouinard2011-11-24 19:32:43 +0000
committerFrancois Chouinard2011-11-28 20:05:19 +0000
commit6eb96d6aa0ff3177ab39cf8242545559ddd5a548 (patch)
treecf0967768d2e2170e33611702cee38995912694e
parentcce6f9293659aede119efeb6cfb8c53342807d67 (diff)
downloadorg.eclipse.linuxtools-6eb96d6aa0ff3177ab39cf8242545559ddd5a548.tar.gz
org.eclipse.linuxtools-6eb96d6aa0ff3177ab39cf8242545559ddd5a548.tar.xz
org.eclipse.linuxtools-6eb96d6aa0ff3177ab39cf8242545559ddd5a548.zip
Re-structure LTTng sub-project as per the Linux Tools guidelines
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/.classpath (renamed from lttng/org.eclipse.linuxtools.lttng.tests/.classpath)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/.gitignore (renamed from lttng/org.eclipse.linuxtools.lttng-feature/.gitignore)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/.project (renamed from lttng/org.eclipse.linuxtools.lttng.tests/.project)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/.settings/org.eclipse.jdt.core.prefs (renamed from lttng/org.eclipse.linuxtools.lttng.tests/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/ChangeLog (renamed from lttng/org.eclipse.linuxtools.lttng.tests/ChangeLog)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF (renamed from lttng/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/build.properties (renamed from lttng/org.eclipse.linuxtools.lttng.tests/build.properties)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/plugin.properties (renamed from lttng/org.eclipse.linuxtools.lttng.tests/plugin.properties)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/pom.xml (renamed from lttng/org.eclipse.linuxtools.lttng.tests/pom.xml)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/ActivateDebugging.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/ActivateDebugging.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/AllLTTngCoreTests.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/AllLTTngCoreTests.java)42
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LttngTestPreparation.java)36
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTest.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTextTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTextTest.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/AllLTTngEventTests.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLTTngEventTests.java)5
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java)20
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java)14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventReferenceTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java)24
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/JniTraceTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/JniTraceTest.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/LttngTraceTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/LttngTraceTest.java)16
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/TmfTraceTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/TmfTraceTest.java)18
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/AllJniTests.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/Combinations.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniEventTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerFieldTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTraceTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTracefileTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/model/LTTngTreeNodeTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/model/LTTngTreeNodeTest.java)30
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/StateManagerFactoryTestSupport.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateManagerFactoryTestSupport.java)12
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/TestStateManager.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/experiment/StateExperimentManagerTextTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/experiment/StateExperimentManagerTextTest.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/AbsStateUpdate.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java)18
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateFactory.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateFactory.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateHandlers.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java)18
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateFactory.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateFactory.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateHandlers.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java)24
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/resource/LTTngStateResourceTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/resource/LTTngStateResourceTest.java)18
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/tests/handlers/AbsStateUpdate.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java)18
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java)16
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java)14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java (renamed from lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java)14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/test.xml (renamed from lttng/org.eclipse.linuxtools.lttng.tests/test.xml)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/.gitignore (renamed from lttng/org.eclipse.linuxtools.lttng.tests/traceset/.gitignore)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15316events_nolost_newformat.tar.gz (renamed from lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.tar.gz)bin150943 -> 150943 bytes
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15316events_nolost_newformat.txt (renamed from lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.txt)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15471events_nolost_newformat.tar.gz (renamed from lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.tar.gz)bin152765 -> 152765 bytes
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15471events_nolost_newformat.txt (renamed from lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.txt)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-2.6.tar.gz (renamed from lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-2.6.tar.gz)bin1179844 -> 1179844 bytes
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF38
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngCorePlugin.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngCorePlugin.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngProjectNature.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngProjectNature.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngConstants.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngConstants.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngFactory.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngFactory.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceDebug.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceDebug.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceHelper.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceHelper.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngCoreProviderFactory.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngCoreProviderFactory.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngSyntheticEventProvider.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java)54
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEvent.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java)18
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventContent.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventField.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventReference.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventReference.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventSource.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventSource.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventType.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngLocation.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngSyntheticEvent.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngSyntheticEvent.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngTimestamp.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/EventOutOfSequenceException.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/EventOutOfSequenceException.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/LttngException.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/LttngException.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/ILTTngTreeNode.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/ILTTngTreeNode.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNode.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNode.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNodeGeneric.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeGeneric.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/ILttngSyntEventRequest.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/ILttngSyntEventRequest.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/IRequestStatusListener.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/IRequestStatusListener.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngBaseEventRequest.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngBaseEventRequest.java)14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngSyntEventRequest.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngSyntEventRequest.java)12
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestCompletedSignal.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestCompletedSignal.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestStartedSignal.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestStartedSignal.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/ILttExperimentSelectedListener.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/ILttExperimentSelectedListener.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/StateExperimentListener.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/StateExperimentListener.java)16
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/LttngStateException.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/LttngStateException.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/StateStrings.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/StateStrings.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/AbsEventToHandlerResolver.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java)12
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IBaseEventProcessor.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IBaseEventProcessor.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IEventToHandlerResolver.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IEventToHandlerResolver.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ILttngEventProcessor.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ILttngEventProcessor.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ITransEventProcessor.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ITransEventProcessor.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateProcessing.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java)18
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateUpdate.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java)32
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateEventToHandlerFactory.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateEventToHandlerFactory.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateUpdateHandlers.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java)48
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/IStateExperimentManager.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/IStateExperimentManager.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateExperimentManager.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java)44
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateManagerFactory.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateManagerFactory.java)18
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LTTngCPUState.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LTTngCPUState.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngBdevState.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngBdevState.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngExecutionState.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngIRQState.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngIRQState.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngProcessState.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java)14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngSoftIRQState.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngSoftIRQState.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTraceState.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java)22
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTrapState.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/StateModelFactory.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/StateModelFactory.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILTTngStateResource.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILTTngStateResource.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILttngStateContext.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILttngStateContext.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/LTTngStateResource.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResource.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/IStateTraceManager.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/IStateTraceManager.java)14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java)52
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java)34
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTextTrace.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java)30
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java)62
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTraceVersion.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/Messages.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/Messages.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/messages.properties (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/messages.properties)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/ProviderResource.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/ProviderResource.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TargetResource.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TargetResource.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TraceResource.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TraceResource.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannel.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannel.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannels.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannels.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceConfig.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceConfig.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/ILttControllerService.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/ILttControllerService.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/LttControllerServiceProxy.java (renamed from lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/LttControllerServiceProxy.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java16
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java12
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java16
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java44
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java26
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java12
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java12
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java10
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java22
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewLTTngProjectWizard.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceLibraryPathPropertyPage.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java24
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java28
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java6
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java12
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java14
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java18
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/.gitignore (renamed from lttng/org.eclipse.linuxtools.lttng.tests/.gitignore)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/.project (renamed from lttng/org.eclipse.linuxtools.lttng-feature/.project)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/build.properties (renamed from lttng/org.eclipse.linuxtools.lttng-feature/build.properties)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/epl-v10.html (renamed from lttng/org.eclipse.linuxtools.lttng-feature/epl-v10.html)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/feature.properties (renamed from lttng/org.eclipse.linuxtools.lttng-feature/feature.properties)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/feature.xml (renamed from lttng/org.eclipse.linuxtools.lttng-feature/feature.xml)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/license.html (renamed from lttng/org.eclipse.linuxtools.lttng-feature/license.html)0
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/pom.xml (renamed from lttng/org.eclipse.linuxtools.lttng-feature/pom.xml)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf-feature/.project17
-rw-r--r--lttng/org.eclipse.linuxtools.tmf-feature/ChangeLog7
-rw-r--r--lttng/org.eclipse.linuxtools.tmf-feature/build.properties4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/.classpath (renamed from lttng/org.eclipse.linuxtools.tmf.tests/.classpath)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/.gitignore (renamed from lttng/org.eclipse.linuxtools.tmf-feature/.gitignore)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/.options (renamed from lttng/org.eclipse.linuxtools.tmf.tests/.options)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/.project (renamed from lttng/org.eclipse.linuxtools.tmf.tests/.project)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/.settings/org.eclipse.jdt.core.prefs (renamed from lttng/org.eclipse.linuxtools.tmf.tests/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/ChangeLog (renamed from lttng/org.eclipse.linuxtools.tmf.tests/ChangeLog)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF (renamed from lttng/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/build.properties (renamed from lttng/org.eclipse.linuxtools.tmf.tests/build.properties)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/plugin.properties (renamed from lttng/org.eclipse.linuxtools.tmf.tests/plugin.properties)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/pom.xml (renamed from lttng/org.eclipse.linuxtools.tmf.tests/pom.xml)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/AllTmfCoreTests.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/AllTmfCoreTests.java)16
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/AllTests.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/AllTests.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java)26
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java)12
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventContentTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java)20
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java)18
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventReferenceTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventSourceTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java)14
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTraceEventTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java)16
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/AllTests.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java)26
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java)26
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java)30
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java)14
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfRequestExecutorTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java)14
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfContextTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java)24
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java)26
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/AllTests.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java)16
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java)16
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/AllTests.java)4
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/TmfFixedArrayTest.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/CreateTestFiles.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfClientStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java)7
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfDataProviderStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java)15
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfEventProviderStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java)15
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfSyntheticEventProviderStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java)21
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventContentStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfSyntheticEventStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfSyntheticEventStub.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfDataRequestStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfDataRequestStub.java)5
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfEventRequestStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfEventRequestStub.java)7
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java)19
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java (renamed from lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java)16
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/test.xml (renamed from lttng/org.eclipse.linuxtools.tmf.tests/test.xml)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/A-Test-10K (renamed from lttng/org.eclipse.linuxtools.tmf.tests/testfiles/A-Test-10K)bin643257 -> 643257 bytes
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/E-Test-10K (renamed from lttng/org.eclipse.linuxtools.tmf.tests/testfiles/E-Test-10K)bin643257 -> 643257 bytes
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/O-Test-10K (renamed from lttng/org.eclipse.linuxtools.tmf.tests/testfiles/O-Test-10K)bin643257 -> 643257 bytes
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/R-Test-10K (renamed from lttng/org.eclipse.linuxtools.tmf.tests/testfiles/R-Test-10K)bin643257 -> 643257 bytes
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/.classpath (renamed from lttng/org.eclipse.linuxtools.tmf/.classpath)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/.gitignore (renamed from lttng/org.eclipse.linuxtools.tmf.tests/.gitignore)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/.options (renamed from lttng/org.eclipse.linuxtools.tmf/.options)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/.project28
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.jdt.core.prefs (renamed from lttng/org.eclipse.linuxtools.tmf/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/ChangeLog204
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF27
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/about.html (renamed from lttng/org.eclipse.linuxtools.tmf/about.html)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/build.properties8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/plugin.properties (renamed from lttng/org.eclipse.linuxtools.tmf/plugin.properties)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/plugin.xml (renamed from lttng/org.eclipse.linuxtools.tmf/plugin.xml)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/pom.xml (renamed from lttng/org.eclipse.linuxtools.tmf-feature/pom.xml)26
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/schema/org.eclipse.linuxtools.tmf.tracetype.exsd (renamed from lttng/org.eclipse.linuxtools.tmf/schema/org.eclipse.linuxtools.tmf.tracetype.exsd)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfCorePlugin.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfProjectNature.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java)14
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfComponent.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfComponent.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfComponent.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java)24
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java)20
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfProviderManager.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfProviderManager.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfThread.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfThread.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfData.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfData.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventContent.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventReference.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventSource.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfNoSuchFieldException.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfNoSuchFieldException.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTraceEvent.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java)42
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentCheckpoint.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentLocation.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLocationArray.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfLocationArray.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/ITmfFilter.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/ITmfFilter.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/ITmfFilterTreeNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/ITmfFilterTreeNode.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterAndNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterAndNode.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterCompareNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterCompareNode.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterContainsNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterContainsNode.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEqualsNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEqualsNode.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEventTypeNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEventTypeNode.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterMatchesNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterMatchesNode.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterNode.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterOrNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterOrNode.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterRootNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterRootNode.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterTreeNode.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterTreeNode.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterContentHandler.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterContentHandler.java)26
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLParser.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLParser.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLWriter.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLWriter.java)20
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/io/BufferedRandomAccessFile.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/io/BufferedRandomAccessFile.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parser/ITmfEventParser.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/parser/ITmfEventParser.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfEventRequest.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedDataRequest.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfRequestExecutor.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfEndSynchSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfEndSynchSignal.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentDisposedSignal.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentRangeUpdatedSignal.java)8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfRangeSynchSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfRangeSynchSignal.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignal.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalHandler.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalHandler.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalTracer.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfStartSynchSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfStartSynchSignal.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceSelectedSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfContext.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfContext.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfLocation.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfLocation.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java)10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLocation.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java)20
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfAsyncSequenceDiagramEvent.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/ITmfAsyncSequenceDiagramEvent.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfSyncSequenceDiagramEvent.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/ITmfSyncSequenceDiagramEvent.java)4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/TmfAsyncSequenceDiagramEvent.java)6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/TmfSyncSequenceDiagramEvent.java)6
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfFixedArray.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfFixedArray.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfSortedArrayList.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfSortedArrayList.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java (renamed from lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfTraceType.java)2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/traceset/.gitignore (renamed from lttng/org.eclipse.linuxtools.tmf/traceset/.gitignore)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java14
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataTest.java2
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java14
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java14
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java14
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/IUml2SdSignalValidator.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderExpTest.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderFindTest.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderSignalTest.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderTimeTest.java8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDSignalValidator.java16
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java12
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestTimestamp.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java24
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/ITmfTraceEditor.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditorInput.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java12
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventContent.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventType.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventsTable.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTraceDefinition.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java12
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java22
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceContext.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java12
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java22
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceContext.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/OpenExperimentHandler.java10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/OpenTraceHandler.java10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/SelectTraceTypeHandler.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewTmfProjectWizard.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceParserUpdatedSignal.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/ITmfEventsFilterListener.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java40
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSetting.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsManager.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsXML.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/events/TmfEventsView.java10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterDialog.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterManager.java8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeContentProvider.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeLabelProvider.java18
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterView.java10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterViewer.java28
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java26
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/AbsTmfStatisticsTree.java4
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfBaseStatisticsTree.java4
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfStatisticsTreeNode.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartEvent.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java18
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java4
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java2
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java2
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java2
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java2
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java2
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java2
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ITimeRange.java2
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SDTimeEvent.java2
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfAsyncMessage.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfSyncMessage.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java38
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/load/LoadersManager.java2
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/MinMaxDialog.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfRawEventViewer.java8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/.project17
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/ChangeLog205
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF27
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/build.properties12
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/epl-v10.html (renamed from lttng/org.eclipse.linuxtools.tmf-feature/epl-v10.html)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/feature.properties (renamed from lttng/org.eclipse.linuxtools.tmf-feature/feature.properties)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/feature.xml (renamed from lttng/org.eclipse.linuxtools.tmf-feature/feature.xml)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/license.html (renamed from lttng/org.eclipse.linuxtools.tmf-feature/license.html)0
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/pom.xml26
-rw-r--r--lttng/pom.xml10
454 files changed, 2059 insertions, 2031 deletions
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/.classpath b/lttng/org.eclipse.linuxtools.lttng.core.tests/.classpath
index 1fa3e6803d..1fa3e6803d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/.classpath
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/.classpath
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/.gitignore b/lttng/org.eclipse.linuxtools.lttng.core.tests/.gitignore
index 8d94ef8deb..8d94ef8deb 100644
--- a/lttng/org.eclipse.linuxtools.lttng-feature/.gitignore
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/.gitignore
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/.project b/lttng/org.eclipse.linuxtools.lttng.core.tests/.project
index dbc4c84892..dbc4c84892 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/.project
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/.project
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/.settings/org.eclipse.jdt.core.prefs b/lttng/org.eclipse.linuxtools.lttng.core.tests/.settings/org.eclipse.jdt.core.prefs
index 1d817b7047..1d817b7047 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/ChangeLog b/lttng/org.eclipse.linuxtools.lttng.core.tests/ChangeLog
index 4202a323aa..4202a323aa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/ChangeLog
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/ChangeLog
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
index 8f91898b51..ed7bbd1071 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@ Require-Bundle: org.junit;bundle-version="3.8.2",
org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
org.eclipse.linuxtools.lttng.jni;bundle-version="0.4.0"
Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin
+Bundle-Activator: org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.linuxtools.lttng.jni
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/build.properties b/lttng/org.eclipse.linuxtools.lttng.core.tests/build.properties
index d9271d71bb..d9271d71bb 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/build.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/build.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/plugin.properties b/lttng/org.eclipse.linuxtools.lttng.core.tests/plugin.properties
index eab88dc1ee..eab88dc1ee 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/plugin.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/plugin.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/pom.xml b/lttng/org.eclipse.linuxtools.lttng.core.tests/pom.xml
index a5c97855ae..133a0f0682 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/pom.xml
@@ -63,7 +63,7 @@
<version>${tycho-version}</version>
<configuration>
<testSuite>org.eclipse.linuxtools.lttng.core.tests</testSuite>
- <testClass>org.eclipse.linuxtools.lttng.tests.AllLTTngCoreTests</testClass>
+ <testClass>org.eclipse.linuxtools.lttng.core.tests.AllLTTngCoreTests</testClass>
<useUIHarness>false</useUIHarness>
<useUIThread>false</useUIThread>
<product>org.eclipse.sdk.ide</product>
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/ActivateDebugging.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/ActivateDebugging.java
index 0552775487..178c16f1d5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/ActivateDebugging.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/ActivateDebugging.java
@@ -1,6 +1,6 @@
-package org.eclipse.linuxtools.lttng.tests;
+package org.eclipse.linuxtools.lttng.core.tests;
-import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
public class ActivateDebugging {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/AllLTTngCoreTests.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/AllLTTngCoreTests.java
index 8641033b9e..151868b969 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/AllLTTngCoreTests.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/AllLTTngCoreTests.java
@@ -1,28 +1,28 @@
-package org.eclipse.linuxtools.lttng.tests;
+package org.eclipse.linuxtools.lttng.core.tests;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.linuxtools.lttng.tests.control.LTTngSyntheticEventProviderTest;
-import org.eclipse.linuxtools.lttng.tests.control.LTTngSyntheticEventProviderTextTest;
-import org.eclipse.linuxtools.lttng.tests.event.LttngEventContentTest;
-import org.eclipse.linuxtools.lttng.tests.event.LttngEventFieldTest;
-import org.eclipse.linuxtools.lttng.tests.event.LttngEventReferenceTest;
-import org.eclipse.linuxtools.lttng.tests.event.LttngEventTest;
-import org.eclipse.linuxtools.lttng.tests.event.LttngEventTypeTest;
-import org.eclipse.linuxtools.lttng.tests.event.LttngTimestampTest;
-import org.eclipse.linuxtools.lttng.tests.jni.JniEventTest;
-import org.eclipse.linuxtools.lttng.tests.jni.JniMarkerFieldTest;
-import org.eclipse.linuxtools.lttng.tests.jni.JniMarkerTest;
-import org.eclipse.linuxtools.lttng.tests.jni.JniTraceTest;
-import org.eclipse.linuxtools.lttng.tests.jni.JniTracefileTest;
-import org.eclipse.linuxtools.lttng.tests.model.LTTngTreeNodeTest;
-import org.eclipse.linuxtools.lttng.tests.state.TestStateManager;
-import org.eclipse.linuxtools.lttng.tests.state.experiment.StateExperimentManagerTextTest;
-import org.eclipse.linuxtools.lttng.tests.state.resource.LTTngStateResourceTest;
-import org.eclipse.linuxtools.lttng.tests.trace.LTTngExperimentTest;
-import org.eclipse.linuxtools.lttng.tests.trace.LTTngTextTraceTest;
-import org.eclipse.linuxtools.lttng.tests.trace.LTTngTraceTest;
+import org.eclipse.linuxtools.lttng.core.tests.control.LTTngSyntheticEventProviderTest;
+import org.eclipse.linuxtools.lttng.core.tests.control.LTTngSyntheticEventProviderTextTest;
+import org.eclipse.linuxtools.lttng.core.tests.event.LttngEventContentTest;
+import org.eclipse.linuxtools.lttng.core.tests.event.LttngEventFieldTest;
+import org.eclipse.linuxtools.lttng.core.tests.event.LttngEventReferenceTest;
+import org.eclipse.linuxtools.lttng.core.tests.event.LttngEventTest;
+import org.eclipse.linuxtools.lttng.core.tests.event.LttngEventTypeTest;
+import org.eclipse.linuxtools.lttng.core.tests.event.LttngTimestampTest;
+import org.eclipse.linuxtools.lttng.core.tests.jni.JniEventTest;
+import org.eclipse.linuxtools.lttng.core.tests.jni.JniMarkerFieldTest;
+import org.eclipse.linuxtools.lttng.core.tests.jni.JniMarkerTest;
+import org.eclipse.linuxtools.lttng.core.tests.jni.JniTraceTest;
+import org.eclipse.linuxtools.lttng.core.tests.jni.JniTracefileTest;
+import org.eclipse.linuxtools.lttng.core.tests.model.LTTngTreeNodeTest;
+import org.eclipse.linuxtools.lttng.core.tests.state.TestStateManager;
+import org.eclipse.linuxtools.lttng.core.tests.state.experiment.StateExperimentManagerTextTest;
+import org.eclipse.linuxtools.lttng.core.tests.state.resource.LTTngStateResourceTest;
+import org.eclipse.linuxtools.lttng.core.tests.trace.LTTngExperimentTest;
+import org.eclipse.linuxtools.lttng.core.tests.trace.LTTngTextTraceTest;
+import org.eclipse.linuxtools.lttng.core.tests.trace.LTTngTraceTest;
public class AllLTTngCoreTests {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java
index 9bdeaaf77b..fbb9aa03fe 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests;
+package org.eclipse.linuxtools.lttng.core.tests;
import org.eclipse.core.runtime.Plugin;
-import org.eclipse.linuxtools.tmf.Tracer;
+import org.eclipse.linuxtools.tmf.core.Tracer;
import org.osgi.framework.BundleContext;
/**
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LttngTestPreparation.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java
index 99ab18330d..1ffa3276c5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LttngTestPreparation.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.tests;
+package org.eclipse.linuxtools.lttng.core.tests;
import java.io.File;
import java.net.URL;
@@ -7,23 +7,23 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent.SequenceInd;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.state.experiment.IStateExperimentManager;
-import org.eclipse.linuxtools.lttng.state.experiment.StateManagerFactory;
-import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd;
+import org.eclipse.linuxtools.lttng.core.state.experiment.IStateExperimentManager;
+import org.eclipse.linuxtools.lttng.core.state.experiment.StateManagerFactory;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace;
+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.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;
@SuppressWarnings("nls")
public abstract class LttngTestPreparation extends TestCase {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTest.java
index 7f2d79d0c6..b446695999 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTest.java
@@ -9,12 +9,12 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.control;
+package org.eclipse.linuxtools.lttng.core.tests.control;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.tests.LttngTestPreparation;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.tests.LttngTestPreparation;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
@SuppressWarnings("nls")
public class LTTngSyntheticEventProviderTest extends LttngTestPreparation {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTextTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTextTest.java
index e44fbe338e..f36ead13df 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTextTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTextTest.java
@@ -9,11 +9,11 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.control;
+package org.eclipse.linuxtools.lttng.core.tests.control;
-import org.eclipse.linuxtools.lttng.tests.LttngTestPreparation;
+import org.eclipse.linuxtools.lttng.core.tests.LttngTestPreparation;
public class LTTngSyntheticEventProviderTextTest extends LttngTestPreparation {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLTTngEventTests.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/AllLTTngEventTests.java
index 03f55936f4..406aeb4b8f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLTTngEventTests.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/AllLTTngEventTests.java
@@ -1,8 +1,9 @@
-package org.eclipse.linuxtools.lttng.tests.event;
+package org.eclipse.linuxtools.lttng.core.tests.event;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.eclipse.linuxtools.lttng.tests.trace.LTTngTextTraceTest;;
+
+import org.eclipse.linuxtools.lttng.core.tests.trace.LTTngTextTraceTest;
@SuppressWarnings("nls")
public final class AllLTTngEventTests extends TestCase {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java
index e18a3f9321..3a8b7da267 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.tests.event;
+package org.eclipse.linuxtools.lttng.core.tests.event;
import java.io.File;
import java.net.URL;
@@ -8,15 +8,15 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngEventContent;
-import org.eclipse.linuxtools.lttng.event.LttngEventField;
-import org.eclipse.linuxtools.lttng.event.LttngEventType;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
-import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
/*
Functions tested here :
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java
index 64b3936878..b6218f4553 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.tests.event;
+package org.eclipse.linuxtools.lttng.core.tests.event;
@@ -9,12 +9,12 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.lttng.event.LttngEventContent;
-import org.eclipse.linuxtools.lttng.event.LttngEventField;
-import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
-import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
/*
Functions tested here :
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventReferenceTest.java
index 5c01b3bee8..47de6156cd 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventReferenceTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.tests.event;
+package org.eclipse.linuxtools.lttng.core.tests.event;
import java.io.File;
import java.net.URL;
@@ -6,10 +6,10 @@ import java.net.URL;
import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.lttng.event.LttngEventReference;
-import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
-import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventReference;
+import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/*
Functions tested here :
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java
index f713dcf887..aad70453d6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.tests.event;
+package org.eclipse.linuxtools.lttng.core.tests.event;
import java.io.File;
import java.net.URL;
@@ -7,18 +7,18 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngEventContent;
-import org.eclipse.linuxtools.lttng.event.LttngEventReference;
-import org.eclipse.linuxtools.lttng.event.LttngEventType;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventReference;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace;
import org.eclipse.linuxtools.lttng.jni.JniEvent;
-import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
-import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
/*
Functions tested here :
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java
index 8adcb3ef3f..c1579235aa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.tests.event;
+package org.eclipse.linuxtools.lttng.core.tests.event;
import java.io.File;
import java.net.URL;
@@ -6,10 +6,10 @@ import java.net.URL;
import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.lttng.event.LttngEventType;
-import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
-import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/*
Functions tested here :
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java
index 20f01d8b33..e14e54f119 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.tests.event;
+package org.eclipse.linuxtools.lttng.core.tests.event;
import java.io.File;
import java.net.URL;
@@ -7,10 +7,10 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
-import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/*
Functions tested here :
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/JniTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/JniTraceTest.java
index 5dbdd3e7c6..5fc59c6cc4 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/JniTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/JniTraceTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxxtools.lttng.tests.headless;
+package org.eclipse.linuxtools.lttng.core.tests.headless;
/*******************************************************************************
* Copyright (c) 2009 Ericsson
*
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/LttngTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/LttngTraceTest.java
index 7e4d8ea5b6..3463273d64 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/LttngTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/LttngTraceTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxxtools.lttng.tests.headless;
+package org.eclipse.linuxtools.lttng.core.tests.headless;
/*******************************************************************************
* Copyright (c) 2009 Ericsson
*
@@ -11,13 +11,13 @@ package org.eclipse.linuxxtools.lttng.tests.headless;
* William Bourque (wbourque@gmail.com) - Initial API and implementation
*******************************************************************************/
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngLocation;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngLocation;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
@SuppressWarnings("nls")
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/TmfTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/TmfTraceTest.java
index 50997e037f..81b25b1d2a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/TmfTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/TmfTraceTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxxtools.lttng.tests.headless;
+package org.eclipse.linuxtools.lttng.core.tests.headless;
/*******************************************************************************
* Copyright (c) 2009 Ericsson
*
@@ -11,14 +11,14 @@ package org.eclipse.linuxxtools.lttng.tests.headless;
* William Bourque (wbourque@gmail.com) - Initial API and implementation
*******************************************************************************/
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
@SuppressWarnings("nls")
public class TmfTraceTest extends TmfEventRequest<LttngEvent> {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/AllJniTests.java
index 3a97ce5060..7f9f659d7b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/AllJniTests.java
@@ -1,5 +1,5 @@
-package org.eclipse.linuxtools.lttng.tests.jni;
+package org.eclipse.linuxtools.lttng.core.tests.jni;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/Combinations.java
index 395d420159..3f37e24a48 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/Combinations.java
@@ -1,7 +1,7 @@
/**
*
*/
-package org.eclipse.linuxtools.lttng.tests.jni;
+package org.eclipse.linuxtools.lttng.core.tests.jni;
import junit.framework.TestCase;
import java.util.HashMap;
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniEventTest.java
index 6a93385634..842f58083e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniEventTest.java
@@ -28,7 +28,7 @@
*/
-package org.eclipse.linuxtools.lttng.tests.jni;
+package org.eclipse.linuxtools.lttng.core.tests.jni;
import junit.framework.TestCase;
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerFieldTest.java
index f224c6fd3b..b58402f98e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerFieldTest.java
@@ -1,5 +1,5 @@
-package org.eclipse.linuxtools.lttng.tests.jni;
+package org.eclipse.linuxtools.lttng.core.tests.jni;
import junit.framework.TestCase;
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerTest.java
index f0fb79c7ff..f5462bebfb 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerTest.java
@@ -1,5 +1,5 @@
-package org.eclipse.linuxtools.lttng.tests.jni;
+package org.eclipse.linuxtools.lttng.core.tests.jni;
import junit.framework.TestCase;
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTraceTest.java
index 7021d0c1d7..717e623dbf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTraceTest.java
@@ -1,5 +1,5 @@
-package org.eclipse.linuxtools.lttng.tests.jni;
+package org.eclipse.linuxtools.lttng.core.tests.jni;
import org.eclipse.linuxtools.lttng.jni.JniEvent;
import org.eclipse.linuxtools.lttng.jni.JniTrace;
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTracefileTest.java
index 2dbc42423d..997353f8c5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTracefileTest.java
@@ -1,5 +1,5 @@
-package org.eclipse.linuxtools.lttng.tests.jni;
+package org.eclipse.linuxtools.lttng.core.tests.jni;
import junit.framework.TestCase;
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/model/LTTngTreeNodeTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/model/LTTngTreeNodeTest.java
index ddc5a201c4..91d1a6a5dc 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/model/LTTngTreeNodeTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/model/LTTngTreeNodeTest.java
@@ -9,9 +9,9 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.model;
+package org.eclipse.linuxtools.lttng.core.tests.model;
-import org.eclipse.linuxtools.lttng.model.LTTngTreeNode;
+import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode;
import junit.framework.TestCase;
@@ -96,7 +96,7 @@ public class LTTngTreeNodeTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNode#getChildren()}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode#getChildren()}.
*/
public void testGetChildren() {
LTTngTreeNode[] childrensOf60 = node60.getChildren();
@@ -116,21 +116,21 @@ public class LTTngTreeNodeTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getId()}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getId()}.
*/
public void testGetId() {
assertEquals(15L, node15.getId().longValue());
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getType()}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getType()}.
*/
public void testGetType() {
assertEquals(this.getClass(), node15.getType());
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getChildByName(java.lang.String)}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getChildByName(java.lang.String)}.
*/
public void testGetChildByName() {
LTTngTreeNode child65 = node60.getChildByName("node65");
@@ -143,7 +143,7 @@ public class LTTngTreeNodeTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#removeChild(org.eclipse.linuxtools.lttng.model.ILTTngTreeNode)}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#removeChild(org.eclipse.linuxtools.lttng.core.model.ILTTngTreeNode)}.
*/
public void testRemoveChild() {
// Verify node20
@@ -184,7 +184,7 @@ public class LTTngTreeNodeTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getChildById(java.lang.Integer)}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getChildById(java.lang.Integer)}.
*/
public void testGetChildById() {
LTTngTreeNode child65 = node60.getChildById(65L);
@@ -197,14 +197,14 @@ public class LTTngTreeNodeTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getParent()}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getParent()}.
*/
public void testGetParent() {
assertEquals(node60, node67.getParent());
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#setParent(org.eclipse.linuxtools.lttng.model.ILTTngTreeNode)}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#setParent(org.eclipse.linuxtools.lttng.core.model.ILTTngTreeNode)}.
*/
public void testSetParent() {
node30.removeChild(node35);
@@ -215,7 +215,7 @@ public class LTTngTreeNodeTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#hasChildren()}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#hasChildren()}.
*/
public void testHasChildren() {
assertEquals(true, node10.hasChildren());
@@ -227,14 +227,14 @@ public class LTTngTreeNodeTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getName()}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getName()}.
*/
public void testGetName() {
assertEquals("node40", node40.getName());
}
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getPath()}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getPath()}.
*/
public void testGetPath() {
String path = node60.getPath();
@@ -243,7 +243,7 @@ public class LTTngTreeNodeTest extends TestCase {
/**
* Test method for
- * {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getAdapter()}
+ * {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getAdapter()}
* .
*/
public void testGetAdapter() {
@@ -253,7 +253,7 @@ public class LTTngTreeNodeTest extends TestCase {
/**
* Test method for
- * {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getAttibute()}
+ * {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getAttibute()}
* .
*/
public void testGetAttribute() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateManagerFactoryTestSupport.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/StateManagerFactoryTestSupport.java
index ff7ee5f7da..845a172546 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateManagerFactoryTestSupport.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/StateManagerFactoryTestSupport.java
@@ -10,16 +10,16 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.state;
+package org.eclipse.linuxtools.lttng.core.tests.state;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.model.LTTngTreeNode;
-import org.eclipse.linuxtools.lttng.state.LttngStateException;
-import org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager;
-import org.eclipse.linuxtools.lttng.state.trace.StateTraceManager;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode;
+import org.eclipse.linuxtools.lttng.core.state.LttngStateException;
+import org.eclipse.linuxtools.lttng.core.state.trace.IStateTraceManager;
+import org.eclipse.linuxtools.lttng.core.state.trace.StateTraceManager;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/TestStateManager.java
index 28023cc003..1740d45a34 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/TestStateManager.java
@@ -10,11 +10,11 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.state;
+package org.eclipse.linuxtools.lttng.core.tests.state;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/experiment/StateExperimentManagerTextTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/experiment/StateExperimentManagerTextTest.java
index 0af52fe684..edf3b8fb72 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/experiment/StateExperimentManagerTextTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/experiment/StateExperimentManagerTextTest.java
@@ -9,9 +9,9 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.state.experiment;
+package org.eclipse.linuxtools.lttng.core.tests.state.experiment;
-import org.eclipse.linuxtools.lttng.tests.LttngTestPreparation;
+import org.eclipse.linuxtools.lttng.core.tests.LttngTestPreparation;
/**
* @author alvaro
@@ -21,7 +21,7 @@ import org.eclipse.linuxtools.lttng.tests.LttngTestPreparation;
public class StateExperimentManagerTextTest extends LttngTestPreparation {
/**
- * Test method for {@link org.eclipse.linuxtools.lttng.state.experiment.StateExperimentManager#experimentSelected_prep(org.eclipse.linuxtools.tmf.experiment.TmfExperiment)}.
+ * Test method for {@link org.eclipse.linuxtools.lttng.core.state.experiment.StateExperimentManager#experimentSelected_prep(org.eclipse.linuxtools.tmf.experiment.TmfExperiment)}.
*/
public void testExperimentSelected_text() {
System.out.println("testExperimentSelected_text: test removed");
@@ -56,7 +56,7 @@ public class StateExperimentManagerTextTest extends LttngTestPreparation {
/**
* Test method for
- * {@link org.eclipse.linuxtools.lttng.state.experiment.StateExperimentManager#experimentSelected_prep(org.eclipse.linuxtools.tmf.experiment.TmfExperiment)}
+ * {@link org.eclipse.linuxtools.lttng.core.state.experiment.StateExperimentManager#experimentSelected_prep(org.eclipse.linuxtools.tmf.experiment.TmfExperiment)}
* .
*/
public void testExperimentSelected_real() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/AbsStateUpdate.java
index 05e32af183..ec7c2b9122 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/AbsStateUpdate.java
@@ -1,13 +1,13 @@
-package org.eclipse.linuxtools.lttng.tests.state.tests.handlers;
+package org.eclipse.linuxtools.lttng.core.tests.state.handlers;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngEventField;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.tmf.event.TmfEventField;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
@SuppressWarnings("nls")
public abstract class AbsStateUpdate implements ILttngEventProcessor {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateFactory.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateFactory.java
index 7042ea162a..1e3e5ff442 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateFactory.java
@@ -9,13 +9,13 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.state.handlers.after;
+package org.eclipse.linuxtools.lttng.core.tests.state.handlers.after;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
/**
* Builds a Map from string event name to a processing handler object, the
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateHandlers.java
index efaa02d6b1..32078596ea 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateHandlers.java
@@ -9,18 +9,18 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.state.handlers.after;
+package org.eclipse.linuxtools.lttng.core.tests.state.handlers.after;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
-import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.tests.state.handlers.AbsStateUpdate;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.tests.state.handlers.AbsStateUpdate;
/**
* Process the system call entry event
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateFactory.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateFactory.java
index bd3bd7a949..c6516816e8 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateFactory.java
@@ -9,13 +9,13 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.state.handlers.before;
+package org.eclipse.linuxtools.lttng.core.tests.state.handlers.before;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
/**
* Builds a Map from string event name to a processing handler object, the
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateHandlers.java
index b1139e9911..a5ab256cbf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateHandlers.java
@@ -9,18 +9,18 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.state.handlers.before;
-
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
-import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.tests.state.handlers.AbsStateUpdate;
+package org.eclipse.linuxtools.lttng.core.tests.state.handlers.before;
+
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionSubMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.tests.state.handlers.AbsStateUpdate;
/**
* Process the system call entry event
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/resource/LTTngStateResourceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/resource/LTTngStateResourceTest.java
index a16040a5cf..5bba549a8e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/resource/LTTngStateResourceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/resource/LTTngStateResourceTest.java
@@ -9,15 +9,15 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.state.resource;
+package org.eclipse.linuxtools.lttng.core.tests.state.resource;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext;
-import org.eclipse.linuxtools.lttng.state.resource.LTTngStateResource;
-import org.eclipse.linuxtools.lttng.state.resource.ILTTngStateResource.GlobalStateMode;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.lttng.core.state.resource.ILttngStateContext;
+import org.eclipse.linuxtools.lttng.core.state.resource.LTTngStateResource;
+import org.eclipse.linuxtools.lttng.core.state.resource.ILTTngStateResource.GlobalStateMode;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
/**
* For inherited methods see: LTTngTreeNodeTest
@@ -149,7 +149,7 @@ public class LTTngStateResourceTest extends TestCase {
// =======================================================================
/**
* Test method for
- * {@link org.eclipse.linuxtools.lttng.state.resource.LTTngStateResource#getChildren()}
+ * {@link org.eclipse.linuxtools.lttng.core.state.resource.LTTngStateResource#getChildren()}
* .
*/
public void testGetChildren() {
@@ -171,7 +171,7 @@ public class LTTngStateResourceTest extends TestCase {
/**
* Test method for
- * {@link org.eclipse.linuxtools.lttng.state.resource.LTTngStateResource#getStateMode()}
+ * {@link org.eclipse.linuxtools.lttng.core.state.resource.LTTngStateResource#getStateMode()}
*/
public void testStateMode() {
// check default
@@ -185,7 +185,7 @@ public class LTTngStateResourceTest extends TestCase {
/**
* Test method for
- * {@link org.eclipse.linuxtools.lttng.state.resource.LTTngStateResource#getContext()}
+ * {@link org.eclipse.linuxtools.lttng.core.state.resource.LTTngStateResource#getContext()}
*/
public void testContext() {
assertEquals(context, node60.getContext());
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/tests/handlers/AbsStateUpdate.java
index f7e930fe00..c1da336262 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/tests/handlers/AbsStateUpdate.java
@@ -1,13 +1,13 @@
-package org.eclipse.linuxtools.lttng.tests.state.handlers;
+package org.eclipse.linuxtools.lttng.core.tests.state.tests.handlers;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngEventField;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.tmf.event.TmfEventField;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
@SuppressWarnings("nls")
public abstract class AbsStateUpdate implements ILttngEventProcessor {
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java
index fe41685c65..aa1a56f2ca 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tests.trace;
+package org.eclipse.linuxtools.lttng.core.tests.trace;
import java.io.File;
import java.io.IOException;
@@ -21,13 +21,13 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
-import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace;
+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;
/**
* <b><u>TmfExperimentTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java
index 581cadaa4e..cd16bd706f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.tests.trace;
+package org.eclipse.linuxtools.lttng.core.tests.trace;
import java.io.File;
import java.net.URL;
@@ -7,12 +7,12 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
-import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace;
+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.eclipse.linuxtools.tmf.core.trace.TmfLocation;
/*
Functions tested here :
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java
index 1f555636b5..c80e520a37 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.tests.trace;
+package org.eclipse.linuxtools.lttng.core.tests.trace;
import java.io.File;
import java.net.URL;
@@ -7,12 +7,12 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.lttng.event.LttngLocation;
-import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
-import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.lttng.core.event.LttngLocation;
+import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/*
Functions tested here :
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/test.xml b/lttng/org.eclipse.linuxtools.lttng.core.tests/test.xml
index 6fc78e9206..6fc78e9206 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/test.xml
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/test.xml
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/.gitignore b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/.gitignore
index db03f234a6..db03f234a6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/.gitignore
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/.gitignore
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.tar.gz b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15316events_nolost_newformat.tar.gz
index 5b26f781ff..5b26f781ff 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.tar.gz
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15316events_nolost_newformat.tar.gz
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.txt b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15316events_nolost_newformat.txt
index 7bfa8c2fb0..7bfa8c2fb0 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.txt
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15316events_nolost_newformat.txt
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.tar.gz b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15471events_nolost_newformat.tar.gz
index a61c4d5ab4..a61c4d5ab4 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.tar.gz
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15471events_nolost_newformat.tar.gz
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.txt b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15471events_nolost_newformat.txt
index c3eb631f58..c3eb631f58 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.txt
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15471events_nolost_newformat.txt
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-2.6.tar.gz b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-2.6.tar.gz
index c7c17d21a1..c7c17d21a1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-2.6.tar.gz
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-2.6.tar.gz
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
index 6441b9ab0e..a8275a04e2 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.linuxtools.lttng.core;singleton:=true
Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.lttng.LTTngCorePlugin
+Bundle-Activator: org.eclipse.linuxtools.lttng.core.LTTngCorePlugin
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
@@ -13,22 +13,22 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.resources;bundle-version="3.7.100"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.linuxtools.lttng,
- org.eclipse.linuxtools.lttng.control,
- org.eclipse.linuxtools.lttng.event,
- org.eclipse.linuxtools.lttng.exceptions,
- org.eclipse.linuxtools.lttng.model,
- org.eclipse.linuxtools.lttng.request,
- org.eclipse.linuxtools.lttng.signal,
- org.eclipse.linuxtools.lttng.state,
- org.eclipse.linuxtools.lttng.state.evProcessor,
- org.eclipse.linuxtools.lttng.state.evProcessor.state,
- org.eclipse.linuxtools.lttng.state.experiment,
- org.eclipse.linuxtools.lttng.state.model,
- org.eclipse.linuxtools.lttng.state.resource,
- org.eclipse.linuxtools.lttng.state.trace,
- org.eclipse.linuxtools.lttng.trace,
- org.eclipse.linuxtools.lttng.tracecontrol.model,
- org.eclipse.linuxtools.lttng.tracecontrol.model.config,
- org.eclipse.linuxtools.lttng.tracecontrol.service
+Export-Package: org.eclipse.linuxtools.lttng.core,
+ org.eclipse.linuxtools.lttng.core.control,
+ org.eclipse.linuxtools.lttng.core.event,
+ org.eclipse.linuxtools.lttng.core.exceptions,
+ org.eclipse.linuxtools.lttng.core.model,
+ org.eclipse.linuxtools.lttng.core.request,
+ org.eclipse.linuxtools.lttng.core.signal,
+ org.eclipse.linuxtools.lttng.core.state,
+ org.eclipse.linuxtools.lttng.core.state.evProcessor,
+ org.eclipse.linuxtools.lttng.core.state.evProcessor.state,
+ org.eclipse.linuxtools.lttng.core.state.experiment,
+ org.eclipse.linuxtools.lttng.core.state.model,
+ org.eclipse.linuxtools.lttng.core.state.resource,
+ org.eclipse.linuxtools.lttng.core.state.trace,
+ org.eclipse.linuxtools.lttng.core.trace,
+ org.eclipse.linuxtools.lttng.core.tracecontrol.model,
+ org.eclipse.linuxtools.lttng.core.tracecontrol.model.config,
+ org.eclipse.linuxtools.lttng.core.tracecontrol.service
Bundle-Localization: plugin
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngCorePlugin.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngCorePlugin.java
index 31f9c1a2b5..7c055fd351 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngCorePlugin.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngCorePlugin.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng;
+package org.eclipse.linuxtools.lttng.core;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngProjectNature.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngProjectNature.java
index db70b8885d..9452a95b0a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngProjectNature.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngProjectNature.java
@@ -10,9 +10,9 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng;
+package org.eclipse.linuxtools.lttng.core;
-import org.eclipse.linuxtools.tmf.TmfProjectNature;
+import org.eclipse.linuxtools.tmf.core.TmfProjectNature;
/**
* <b><u>LTTngProjectNature</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngConstants.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngConstants.java
index 27cd5d7996..cf39b948fa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngConstants.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngConstants.java
@@ -10,7 +10,7 @@
* Bernd Hufmann - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng;
+package org.eclipse.linuxtools.lttng.core;
/**
* <b><u>LttngConstants</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngFactory.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngFactory.java
index e477f180ae..c684ec59c8 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngFactory.java
@@ -9,10 +9,10 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng;
+package org.eclipse.linuxtools.lttng.core;
-import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.state.experiment.StateManagerFactory;
+import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.lttng.core.state.experiment.StateManagerFactory;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceDebug.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceDebug.java
index 8e23ab89f8..26f3e057fc 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceDebug.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceDebug.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng;
+package org.eclipse.linuxtools.lttng.core;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceHelper.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceHelper.java
index ac353a2a32..65cbdf385f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceHelper.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceHelper.java
@@ -10,7 +10,7 @@
* Yufen Kuo (ykuo@mvista.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng;
+package org.eclipse.linuxtools.lttng.core;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngCoreProviderFactory.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngCoreProviderFactory.java
index d14d2c2c7e..5247c9ff6a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngCoreProviderFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngCoreProviderFactory.java
@@ -9,13 +9,13 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.control;
+package org.eclipse.linuxtools.lttng.core.control;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.model.LTTngTreeNode;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngSyntheticEventProvider.java
index 554ed21ee0..0ed398abe9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngSyntheticEventProvider.java
@@ -11,7 +11,7 @@
* Marc Dumais (marc.dumais@ericsson.com) - Fix for 316455 (first part)
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.control;
+package org.eclipse.linuxtools.lttng.core.control;
import java.util.HashMap;
import java.util.Iterator;
@@ -19,32 +19,32 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngEventType;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent.SequenceInd;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.model.LTTngTreeNode;
-import org.eclipse.linuxtools.lttng.request.LttngBaseEventRequest;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor;
-import org.eclipse.linuxtools.lttng.state.evProcessor.state.StateEventToHandlerFactory;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager;
-import org.eclipse.linuxtools.tmf.component.TmfEventProvider;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.ITmfEventRequest;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
-import org.eclipse.linuxtools.tmf.signal.TmfEndSynchSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfStartSynchSignal;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd;
+import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode;
+import org.eclipse.linuxtools.lttng.core.request.LttngBaseEventRequest;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.state.StateEventToHandlerFactory;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.state.trace.IStateTraceManager;
+import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+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.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.signal.TmfEndSynchSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfStartSynchSignal;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEvent.java
index 3849fe63ed..082b9169f9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEvent.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.lttng.event;
+package org.eclipse.linuxtools.lttng.core.event;
import org.eclipse.linuxtools.lttng.jni.JniEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
/**
* <b><u>LttngEvent</u></b>
@@ -37,11 +37,11 @@ public class LttngEvent extends TmfEvent {
* @param reference The reference of this event
* @param lttEvent A reference to a valid JniEvent object
*
- * @see org.eclipse.linuxtools.tmf.event.TmfTimestamp
- * @see org.eclipse.linuxtools.tmf.event.TmfEventSource
- * @see org.eclipse.linuxtools.lttng.event.LttngEventType
- * @see org.eclipse.linuxtools.lttng.event.LttngEventContent
- * @see org.eclipse.linuxtools.lttng.event.LttngEventReference
+ * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp
+ * @see org.eclipse.linuxtools.tmf.core.event.TmfEventSource
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngEventType
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngEventContent
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngEventReference
* @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent
*/
public LttngEvent(TmfTrace<LttngEvent> parent, LttngTimestamp timestamp, TmfEventSource source, LttngEventType type, LttngEventContent content,
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventContent.java
index 126f6207bb..a5cc04bca9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventContent.java
@@ -10,13 +10,13 @@
* William Bourque (wbourque@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.event;
+package org.eclipse.linuxtools.lttng.core.event;
import java.util.HashMap;
import org.eclipse.linuxtools.lttng.jni.JniEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;
-import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException;
/**
* <b><u>LttngEventContent</u></b><p>
@@ -42,7 +42,7 @@ public class LttngEventContent extends TmfEventContent {
*
* @param thisParent Parent event for this content.
*
- * @see org.eclipse.linuxtools.lttng.event.LttngEvent
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent
*/
public LttngEventContent(LttngEvent thisParent) {
super(thisParent, null);
@@ -54,7 +54,7 @@ public class LttngEventContent extends TmfEventContent {
* @param thisParent Parent event for this content.
* @param thisContent Already parsed content.
*
- * @see org.eclipse.linuxtools.lttng.event.LttngEvent
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent
*/
public LttngEventContent(LttngEvent thisParent, HashMap<String, LttngEventField> thisContent) {
super(thisParent, null);
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventField.java
index 4c1170035d..e5020b0495 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventField.java
@@ -10,10 +10,10 @@
* William Bourque (wbourque@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.event;
+package org.eclipse.linuxtools.lttng.core.event;
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;
-import org.eclipse.linuxtools.tmf.event.TmfEventField;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
/**
* <b><u>LttngEventField</u></b><p>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventReference.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventReference.java
index daacb06846..38a78e078a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventReference.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventReference.java
@@ -10,9 +10,9 @@
* William Bourque (wbourque@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.event;
+package org.eclipse.linuxtools.lttng.core.event;
-import org.eclipse.linuxtools.tmf.event.*;
+import org.eclipse.linuxtools.tmf.core.event.*;
/**
* <b><u>LttngEventReference</u></b><p>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventSource.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventSource.java
index 68d9c61237..dc04bb6b79 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventSource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventSource.java
@@ -10,9 +10,9 @@
* William Bourque (wbourque@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.event;
+package org.eclipse.linuxtools.lttng.core.event;
-import org.eclipse.linuxtools.tmf.event.*;
+import org.eclipse.linuxtools.tmf.core.event.*;
/**
* <b><u>LttngEventSource</u></b><p>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventType.java
index 3435197cf2..27b0dd4aac 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventType.java
@@ -10,9 +10,9 @@
* William Bourque (wbourque@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.event;
+package org.eclipse.linuxtools.lttng.core.event;
-import org.eclipse.linuxtools.tmf.event.*;
+import org.eclipse.linuxtools.tmf.core.event.*;
/**
* <b><u>LttngEventType</u></b><p>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngLocation.java
index 25913fcad1..f8111db5b2 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngLocation.java
@@ -1,6 +1,6 @@
-package org.eclipse.linuxtools.lttng.event;
+package org.eclipse.linuxtools.lttng.core.event;
-import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
public class LttngLocation implements ITmfLocation<LttngTimestamp>, Comparable<LttngLocation> {
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngSyntheticEvent.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngSyntheticEvent.java
index 2f1526975f..0cf6c8d30f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngSyntheticEvent.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngSyntheticEvent.java
@@ -9,12 +9,12 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.event;
+package org.eclipse.linuxtools.lttng.core.event;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.jni.JniEvent;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
/**
* @author alvaro
@@ -123,7 +123,7 @@ public class LttngSyntheticEvent extends LttngEvent {
/**
* /* (non-Javadoc)
*
- * @see org.eclipse.linuxtools.lttng.event.LttngEvent#getParentTrace()
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent#getParentTrace()
*/
@SuppressWarnings("unchecked")
@Override
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngTimestamp.java
index bc93f392a3..974f4d644e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngTimestamp.java
@@ -10,9 +10,9 @@
* William Bourque (wbourque@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.event;
+package org.eclipse.linuxtools.lttng.core.event;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
/**
* <b><u>LttngTimestamp</u></b><p>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/EventOutOfSequenceException.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/EventOutOfSequenceException.java
index 5e002803f5..4ee9e79986 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/EventOutOfSequenceException.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/EventOutOfSequenceException.java
@@ -1,7 +1,7 @@
/**
*
*/
-package org.eclipse.linuxtools.lttng.exceptions;
+package org.eclipse.linuxtools.lttng.core.exceptions;
/**
* @author francois
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/LttngException.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/LttngException.java
index 00226c85fe..a325546a29 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/LttngException.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/LttngException.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.exceptions;
+package org.eclipse.linuxtools.lttng.core.exceptions;
/**
* <b><u>LttngException</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/ILTTngTreeNode.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/ILTTngTreeNode.java
index 0d6da5eb5d..16d5cb65c1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/ILTTngTreeNode.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/ILTTngTreeNode.java
@@ -9,7 +9,7 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.model;
+package org.eclipse.linuxtools.lttng.core.model;
import org.eclipse.core.runtime.IAdaptable;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNode.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNode.java
index 65de900fdc..e50e06e872 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNode.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNode.java
@@ -9,7 +9,7 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.model;
+package org.eclipse.linuxtools.lttng.core.model;
public class LTTngTreeNode extends
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeGeneric.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNodeGeneric.java
index 08755cabb0..ad2541d0ad 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeGeneric.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNodeGeneric.java
@@ -9,15 +9,15 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.model;
+package org.eclipse.linuxtools.lttng.core.model;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.tmf.event.TmfData;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.tmf.core.event.TmfData;
public abstract class LTTngTreeNodeGeneric<E extends LTTngTreeNodeGeneric<E>>
extends TmfData implements ILTTngTreeNode<E> {
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/ILttngSyntEventRequest.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/ILttngSyntEventRequest.java
index aaff37fedb..9e0be15f52 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/ILttngSyntEventRequest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/ILttngSyntEventRequest.java
@@ -9,12 +9,12 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.request;
+package org.eclipse.linuxtools.lttng.core.request;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.tmf.component.TmfEventProvider;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
public interface ILttngSyntEventRequest extends ITmfDataRequest<LttngSyntheticEvent> {
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/IRequestStatusListener.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/IRequestStatusListener.java
index c0d1feb8a6..97d305f4f1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/IRequestStatusListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/IRequestStatusListener.java
@@ -9,7 +9,7 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.request;
+package org.eclipse.linuxtools.lttng.core.request;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngBaseEventRequest.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngBaseEventRequest.java
index bdc3e98d61..f6b7606fe4 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngBaseEventRequest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngBaseEventRequest.java
@@ -10,14 +10,14 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
* Marc Dumais (marc.dumais@ericsson.com) - Fix for 316455 (first part)
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.request;
+package org.eclipse.linuxtools.lttng.core.request;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+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.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
/**
* This class is an extension of Tmf Event Request which includes specific
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngSyntEventRequest.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngSyntEventRequest.java
index 96a0886a6b..4c250ae01b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngSyntEventRequest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngSyntEventRequest.java
@@ -9,15 +9,15 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.request;
+package org.eclipse.linuxtools.lttng.core.request;
import java.util.Vector;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor;
-import org.eclipse.linuxtools.tmf.component.TmfEventProvider;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor;
+import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
/**
* This class is an extension of Data Request which includes specific references
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestCompletedSignal.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestCompletedSignal.java
index 6604dd2144..8f9ab7f630 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestCompletedSignal.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestCompletedSignal.java
@@ -1,6 +1,6 @@
-package org.eclipse.linuxtools.lttng.request;
+package org.eclipse.linuxtools.lttng.core.request;
-import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignal;
public class RequestCompletedSignal extends TmfSignal {
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestStartedSignal.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestStartedSignal.java
index 624cb87719..cad89ab04e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestStartedSignal.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestStartedSignal.java
@@ -1,6 +1,6 @@
-package org.eclipse.linuxtools.lttng.request;
+package org.eclipse.linuxtools.lttng.core.request;
-import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignal;
public class RequestStartedSignal extends TmfSignal {
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/ILttExperimentSelectedListener.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/ILttExperimentSelectedListener.java
index dfd115f192..9217c8e91e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/ILttExperimentSelectedListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/ILttExperimentSelectedListener.java
@@ -9,11 +9,11 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.signal;
+package org.eclipse.linuxtools.lttng.core.signal;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/StateExperimentListener.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/StateExperimentListener.java
index e47fcc9de9..3f733f5c20 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/StateExperimentListener.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/StateExperimentListener.java
@@ -9,15 +9,15 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.signal;
+package org.eclipse.linuxtools.lttng.core.signal;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.tmf.component.TmfComponent;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.tmf.core.component.TmfComponent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/LttngStateException.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/LttngStateException.java
index 843d6e72e9..0361aa76fc 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/LttngStateException.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/LttngStateException.java
@@ -10,7 +10,7 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state;
+package org.eclipse.linuxtools.lttng.core.state;
/**
*
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/StateStrings.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/StateStrings.java
index be1149921f..7b1076fd65 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/StateStrings.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/StateStrings.java
@@ -10,7 +10,7 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
* Daniel U. Thibault (daniel.thibault@drdc-rddc.gc.ca) - 2011-06-21 Fixes
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state;
+package org.eclipse.linuxtools.lttng.core.state;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/AbsEventToHandlerResolver.java
index f9f950efa9..35db1f739f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/AbsEventToHandlerResolver.java
@@ -11,15 +11,15 @@
* Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.evProcessor;
+package org.eclipse.linuxtools.lttng.core.state.evProcessor;
import java.util.Set;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IBaseEventProcessor.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IBaseEventProcessor.java
index 9356a4bd4c..63f72d8f09 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IBaseEventProcessor.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IBaseEventProcessor.java
@@ -10,10 +10,10 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
* Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.evProcessor;
+package org.eclipse.linuxtools.lttng.core.state.evProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
public interface IBaseEventProcessor {
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IEventToHandlerResolver.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IEventToHandlerResolver.java
index 7d1de8c8b9..ce877fbdea 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IEventToHandlerResolver.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IEventToHandlerResolver.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.state.evProcessor;
+package org.eclipse.linuxtools.lttng.core.state.evProcessor;
public interface IEventToHandlerResolver {
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ILttngEventProcessor.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ILttngEventProcessor.java
index 14c8fc23a8..9710e13d06 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ILttngEventProcessor.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ILttngEventProcessor.java
@@ -10,10 +10,10 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
* Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.evProcessor;
+package org.eclipse.linuxtools.lttng.core.state.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ITransEventProcessor.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ITransEventProcessor.java
index 3b5aeea88e..805c765536 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ITransEventProcessor.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ITransEventProcessor.java
@@ -10,7 +10,7 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
* Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.evProcessor;
+package org.eclipse.linuxtools.lttng.core.state.evProcessor;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateProcessing.java
index 306858d2a6..00ce0efaac 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateProcessing.java
@@ -1,16 +1,16 @@
/**
*
*/
-package org.eclipse.linuxtools.lttng.state.evProcessor.state;
+package org.eclipse.linuxtools.lttng.core.state.evProcessor.state;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngEventContent;
-import org.eclipse.linuxtools.lttng.event.LttngEventField;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.tmf.event.TmfEventField;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
/**
* Common utility methods for all state processing handlers, not intended to be
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateUpdate.java
index 6d3b58b1a4..03bf13e2d2 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateUpdate.java
@@ -10,22 +10,22 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
* Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.evProcessor.state;
-
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LTTngCPUState;
-import org.eclipse.linuxtools.lttng.state.model.LttngBdevState;
-import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
-import org.eclipse.linuxtools.lttng.state.model.LttngIRQState;
-import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+package org.eclipse.linuxtools.lttng.core.state.evProcessor.state;
+
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LTTngCPUState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngBdevState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngIRQState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
public abstract class AbsStateUpdate extends AbsStateProcessing implements
ILttngEventProcessor {
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateEventToHandlerFactory.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateEventToHandlerFactory.java
index 7e49a6fd04..882ac8217e 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateEventToHandlerFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateEventToHandlerFactory.java
@@ -10,14 +10,14 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
* Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.evProcessor.state;
+package org.eclipse.linuxtools.lttng.core.state.evProcessor.state;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventToHandlerResolver;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
/**
* Builds a Map from string event name to a processing handler object, the
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateUpdateHandlers.java
index a6f31eb236..35b88956ee 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateUpdateHandlers.java
@@ -11,33 +11,33 @@
* Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.evProcessor.state;
+package org.eclipse.linuxtools.lttng.core.state.evProcessor.state;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.StateStrings.BdevMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.CpuMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessType;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LTTngCPUState;
-import org.eclipse.linuxtools.lttng.state.model.LttngBdevState;
-import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState;
-import org.eclipse.linuxtools.lttng.state.model.LttngIRQState;
-import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.state.model.LttngSoftIRQState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTrapState;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.BdevMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.CpuMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionSubMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessType;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LTTngCPUState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngBdevState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngIRQState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngSoftIRQState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTrapState;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
/**
* Wraps the creation of individual handlers, each method creates and instance
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/IStateExperimentManager.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/IStateExperimentManager.java
index 9258dc13f8..0840577677 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/IStateExperimentManager.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/IStateExperimentManager.java
@@ -10,12 +10,12 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.experiment;
+package org.eclipse.linuxtools.lttng.core.state.experiment;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.model.LTTngTreeNode;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
public interface IStateExperimentManager {
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateExperimentManager.java
index 25d3421034..6e62d11b7f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateExperimentManager.java
@@ -10,32 +10,32 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
* Marc Dumais (marc.dumais@ericsson.com) - Fix for 316455 (second part)
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.experiment;
+package org.eclipse.linuxtools.lttng.core.state.experiment;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent.SequenceInd;
-import org.eclipse.linuxtools.lttng.model.LTTngTreeNode;
-import org.eclipse.linuxtools.lttng.signal.ILttExperimentSelectedListener;
-import org.eclipse.linuxtools.lttng.signal.StateExperimentListener;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.ITmfEventRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd;
+import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode;
+import org.eclipse.linuxtools.lttng.core.signal.ILttExperimentSelectedListener;
+import org.eclipse.linuxtools.lttng.core.signal.StateExperimentListener;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.state.trace.IStateTraceManager;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateManagerFactory.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateManagerFactory.java
index 22411b92a0..6abe08e320 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateManagerFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateManagerFactory.java
@@ -10,15 +10,15 @@
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.experiment;
-
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.model.LTTngTreeNode;
-import org.eclipse.linuxtools.lttng.state.LttngStateException;
-import org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager;
-import org.eclipse.linuxtools.lttng.state.trace.StateTraceManager;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+package org.eclipse.linuxtools.lttng.core.state.experiment;
+
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode;
+import org.eclipse.linuxtools.lttng.core.state.LttngStateException;
+import org.eclipse.linuxtools.lttng.core.state.trace.IStateTraceManager;
+import org.eclipse.linuxtools.lttng.core.state.trace.StateTraceManager;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LTTngCPUState.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LTTngCPUState.java
index 0d2a3d1e6f..e6094f81ba 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LTTngCPUState.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LTTngCPUState.java
@@ -9,12 +9,12 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.model;
+package org.eclipse.linuxtools.lttng.core.state.model;
import java.util.Stack;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.StateStrings.CpuMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.CpuMode;
/**
* <b><u>LTTngCPUState</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngBdevState.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngBdevState.java
index d5f94d6aba..08d037ceae 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngBdevState.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngBdevState.java
@@ -9,12 +9,12 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.model;
+package org.eclipse.linuxtools.lttng.core.state.model;
import java.util.Stack;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.state.StateStrings.BdevMode;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.BdevMode;
/**
* <b><u>LttvBdevState</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngExecutionState.java
index 7e6240329d..1392bafb24 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngExecutionState.java
@@ -9,10 +9,10 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.model;
+package org.eclipse.linuxtools.lttng.core.state.model;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
/**
* <b><u>LttngExecutionState</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngIRQState.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngIRQState.java
index f5e874c07c..afd4f133e0 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngIRQState.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngIRQState.java
@@ -9,12 +9,12 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.model;
+package org.eclipse.linuxtools.lttng.core.state.model;
import java.util.Stack;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode;
/**
* <b><u>LttvIRQState</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngProcessState.java
index 052bdb740e..3a9ebff5db 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngProcessState.java
@@ -9,16 +9,16 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.model;
+package org.eclipse.linuxtools.lttng.core.state.model;
import java.util.Stack;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionSubMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus;
/**
* <b>LttngProcessState</b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngSoftIRQState.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngSoftIRQState.java
index d22892afa2..9057ac15c6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngSoftIRQState.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngSoftIRQState.java
@@ -9,7 +9,7 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.model;
+package org.eclipse.linuxtools.lttng.core.state.model;
/**
* <b>LttvSoftIRQState</b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTraceState.java
index 42dadead69..f2e9b40a0b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTraceState.java
@@ -9,22 +9,22 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.model;
+package org.eclipse.linuxtools.lttng.core.state.model;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.state.LttngStateException;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
-import org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.state.LttngStateException;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionSubMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.core.state.resource.ILttngStateContext;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
/**
* <b><u>LttngTraceState</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTrapState.java
index aa8ff1b105..5cbba2c0ec 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTrapState.java
@@ -9,7 +9,7 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.model;
+package org.eclipse.linuxtools.lttng.core.state.model;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/StateModelFactory.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/StateModelFactory.java
index 8ab180e119..f353dba67f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/StateModelFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/StateModelFactory.java
@@ -9,10 +9,10 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.model;
+package org.eclipse.linuxtools.lttng.core.state.model;
-import org.eclipse.linuxtools.lttng.state.LttngStateException;
-import org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext;
+import org.eclipse.linuxtools.lttng.core.state.LttngStateException;
+import org.eclipse.linuxtools.lttng.core.state.resource.ILttngStateContext;
/**
* Entry point to the package
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILTTngStateResource.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILTTngStateResource.java
index 3e422b43c1..b8d3ab6d2b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILTTngStateResource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILTTngStateResource.java
@@ -9,9 +9,9 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.resource;
+package org.eclipse.linuxtools.lttng.core.state.resource;
-import org.eclipse.linuxtools.lttng.model.ILTTngTreeNode;
+import org.eclipse.linuxtools.lttng.core.model.ILTTngTreeNode;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILttngStateContext.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILttngStateContext.java
index 8e5a70e381..dffd928f7d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILttngStateContext.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILttngStateContext.java
@@ -9,10 +9,10 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.resource;
+package org.eclipse.linuxtools.lttng.core.state.resource;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
/**
* <b><u>ILttngStateContext</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResource.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/LTTngStateResource.java
index 3a077420ab..eda1ce5033 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/LTTngStateResource.java
@@ -9,11 +9,11 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.resource;
+package org.eclipse.linuxtools.lttng.core.state.resource;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric;
-import org.eclipse.linuxtools.lttng.state.resource.ILTTngStateResource.GlobalStateMode;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric;
+import org.eclipse.linuxtools.lttng.core.state.resource.ILTTngStateResource.GlobalStateMode;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/IStateTraceManager.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/IStateTraceManager.java
index fb7d22daa0..1b2ba88466 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/IStateTraceManager.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/IStateTraceManager.java
@@ -1,11 +1,11 @@
-package org.eclipse.linuxtools.lttng.state.trace;
+package org.eclipse.linuxtools.lttng.core.state.trace;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
public interface IStateTraceManager {
// /**
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java
index 4f33751c43..3e54400b20 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java
@@ -9,37 +9,37 @@
* Contributors:
* Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.state.trace;
+package org.eclipse.linuxtools.lttng.core.state.trace;
import java.util.Collections;
import java.util.HashMap;
import java.util.Vector;
-import org.eclipse.linuxtools.lttng.TraceDebug;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent.SequenceInd;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.model.LTTngTreeNode;
-import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.request.IRequestStatusListener;
-import org.eclipse.linuxtools.lttng.request.LttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.state.LttngStateException;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor;
-import org.eclipse.linuxtools.lttng.state.evProcessor.state.StateEventToHandlerFactory;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.state.model.StateModelFactory;
-import org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext;
-import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace;
-import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd;
+import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode;
+import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest;
+import org.eclipse.linuxtools.lttng.core.request.IRequestStatusListener;
+import org.eclipse.linuxtools.lttng.core.request.LttngSyntEventRequest;
+import org.eclipse.linuxtools.lttng.core.state.LttngStateException;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.state.StateEventToHandlerFactory;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.state.model.StateModelFactory;
+import org.eclipse.linuxtools.lttng.core.state.resource.ILttngStateContext;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+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.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
public class StateTraceManager extends LTTngTreeNode implements IStateTraceManager, ILttngStateContext {
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java
index 00b81d3d95..0cae078123 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java
@@ -10,25 +10,25 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.trace;
+package org.eclipse.linuxtools.lttng.core.trace;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
import org.eclipse.linuxtools.lttng.jni.JniTrace;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperimentContext;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperimentLocation;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+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.experiment.TmfExperimentContext;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperimentLocation;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/**
* <b><u>LTTngExperiment</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTextTrace.java
index 19a48f0b68..d731f74f6d 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTextTrace.java
@@ -10,28 +10,28 @@
* William Bourque (wbourque@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.trace;
+package org.eclipse.linuxtools.lttng.core.trace;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.HashMap;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngEventContent;
-import org.eclipse.linuxtools.lttng.event.LttngEventField;
-import org.eclipse.linuxtools.lttng.event.LttngEventReference;
-import org.eclipse.linuxtools.lttng.event.LttngEventSource;
-import org.eclipse.linuxtools.lttng.event.LttngEventType;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventField;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventReference;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventSource;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
import org.eclipse.linuxtools.lttng.jni.JniEvent;
-import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
-import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
public class LTTngTextTrace extends TmfTrace<LttngEvent> {
private LttngTimestamp eventTimestamp = null;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java
index c6c65b147f..9fdf11281a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java
@@ -11,7 +11,7 @@
* Yufen Kuo (ykuo@mvista.com) - add support to allow user specify trace library path
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.trace;
+package org.eclipse.linuxtools.lttng.core.trace;
import java.io.FileNotFoundException;
import java.util.HashMap;
@@ -19,15 +19,15 @@ import java.util.Iterator;
import java.util.Vector;
import org.eclipse.core.resources.IProject;
-import org.eclipse.linuxtools.lttng.TraceHelper;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngEventContent;
-import org.eclipse.linuxtools.lttng.event.LttngEventReference;
-import org.eclipse.linuxtools.lttng.event.LttngEventSource;
-import org.eclipse.linuxtools.lttng.event.LttngEventType;
-import org.eclipse.linuxtools.lttng.event.LttngLocation;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.exceptions.LttngException;
+import org.eclipse.linuxtools.lttng.core.TraceHelper;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventContent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventReference;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventSource;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventType;
+import org.eclipse.linuxtools.lttng.core.event.LttngLocation;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.exceptions.LttngException;
import org.eclipse.linuxtools.lttng.jni.JniEvent;
import org.eclipse.linuxtools.lttng.jni.JniMarker;
import org.eclipse.linuxtools.lttng.jni.JniTrace;
@@ -35,13 +35,13 @@ import org.eclipse.linuxtools.lttng.jni.JniTracefile;
import org.eclipse.linuxtools.lttng.jni.common.JniTime;
import org.eclipse.linuxtools.lttng.jni.exception.JniException;
import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
-import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
class LTTngTraceException extends LttngException {
static final long serialVersionUID = -1636648737081868146L;
@@ -351,7 +351,7 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
*
* @return The LttngLocation as it was after the last operation.
*
- * @see org.eclipse.linuxtools.lttng.event.LttngLocation
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation
*/
@Override
public synchronized ITmfLocation<?> getCurrentLocation() {
@@ -370,8 +370,8 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
*
* @return The TmfContext that point to this event
*
- * @see org.eclipse.linuxtools.lttng.event.LttngLocation
- * @see org.eclipse.linuxtools.tmf.trace.TmfContext
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation
+ * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext
*/
@Override
public synchronized TmfContext seekLocation(ITmfLocation<?> location) {
@@ -416,8 +416,8 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
*
* @return The TmfContext that point to this event
*
- * @see org.eclipse.linuxtools.lttng.event.LttngLocation
- * @see org.eclipse.linuxtools.tmf.trace.TmfContext
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation
+ * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext
*/
@Override
public synchronized TmfContext seekEvent(TmfTimestamp timestamp) {
@@ -454,8 +454,8 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
*
* @return The TmfContext that point to this event
*
- * @see org.eclipse.linuxtools.lttng.event.LttngLocation
- * @see org.eclipse.linuxtools.tmf.trace.TmfContext
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation
+ * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext
*/
@Override
public synchronized TmfContext seekEvent(long position) {
@@ -542,8 +542,8 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
*
* @return The LttngEvent we read of null if no event are available
*
- * @see org.eclipse.linuxtools.lttng.event.LttngLocation
- * @see org.eclipse.linuxtools.tmf.trace.TmfContext
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation
+ * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext
*/
public int nbEventsRead = 0;
@@ -676,8 +676,8 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
*
* @return The LttngEvent we read of null if no event are available
*
- * @see org.eclipse.linuxtools.lttng.event.LttngLocation
- * @see org.eclipse.linuxtools.tmf.trace.TmfContext
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation
+ * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext
*/
@Override
public synchronized LttngEvent parseEvent(TmfContext context) {
@@ -808,7 +808,7 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
* @return The converted LttngEvent
*
* @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent
- * @see org.eclipse.linuxtools.lttng.event.LttngEvent
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent
*/
public synchronized LttngEvent convertJniEventToTmf(JniEvent newEvent) {
currentLttngEvent = convertJniEventToTmf(newEvent, IS_PARSING_NEEDED_DEFAULT);
@@ -827,7 +827,7 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
* @return The converted LttngEvent
*
* @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent
- * @see org.eclipse.linuxtools.lttng.event.LttngEvent
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent
*/
public synchronized LttngEvent convertJniEventToTmf(JniEvent jniEvent, boolean isParsingNeeded) {
@@ -926,7 +926,7 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
*
* @return The current (last read) LttngEvent
*
- * @see org.eclipse.linuxtools.lttng.event.LttngEvent
+ * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent
*/
public synchronized LttngEvent getCurrentEvent() {
return currentLttngEvent;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTraceVersion.java
index b3c986dd07..71437613d5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTraceVersion.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.lttng.trace;
+package org.eclipse.linuxtools.lttng.core.trace;
/*******************************************************************************
* Copyright (c) 2009, 2011 Ericsson, MontaVista Software
*
@@ -12,7 +12,7 @@ package org.eclipse.linuxtools.lttng.trace;
* Yufen Kuo (ykuo@mvista.com) - add support to allow user specify trace library path
*******************************************************************************/
-import org.eclipse.linuxtools.lttng.exceptions.LttngException;
+import org.eclipse.linuxtools.lttng.core.exceptions.LttngException;
import org.eclipse.linuxtools.lttng.jni.exception.JniTraceVersionException;
import org.eclipse.linuxtools.lttng.jni.factory.JniTraceVersion;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/Messages.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/Messages.java
index 6c0cac7ceb..fd456a7dec 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/Messages.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/Messages.java
@@ -10,7 +10,7 @@
* Bernd Hufmann - Initial API and implementation
*
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tracecontrol;
+package org.eclipse.linuxtools.lttng.core.tracecontrol;
import org.eclipse.osgi.util.NLS;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/messages.properties b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/messages.properties
index 4328aafe5f..4328aafe5f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/messages.properties
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/messages.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/ProviderResource.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/ProviderResource.java
index 9394af06f1..8ad3c419cd 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/ProviderResource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/ProviderResource.java
@@ -11,14 +11,14 @@
* Bernd Hufmann - Productification, enhancements and fixes
*
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tracecontrol.model;
+package org.eclipse.linuxtools.lttng.core.tracecontrol.model;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
import org.eclipse.rse.core.subsystems.AbstractResource;
import org.eclipse.rse.core.subsystems.ISubSystem;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TargetResource.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TargetResource.java
index a33411abcf..fd1b5d21da 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TargetResource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TargetResource.java
@@ -11,16 +11,16 @@
* Bernd Hufmann - Productification, enhancements and fixes
*
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tracecontrol.model;
+package org.eclipse.linuxtools.lttng.core.tracecontrol.model;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.ProviderResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
import org.eclipse.rse.core.subsystems.AbstractResource;
import org.eclipse.rse.core.subsystems.ISubSystem;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TraceResource.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TraceResource.java
index 2c1c1eb8dd..79fa799764 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TraceResource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TraceResource.java
@@ -11,15 +11,15 @@
* Bernd Hufmann - Productification, enhancements and fixes
*
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tracecontrol.model;
+package org.eclipse.linuxtools.lttng.core.tracecontrol.model;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.eclipse.linuxtools.lttng.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.Messages;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
import org.eclipse.rse.core.subsystems.AbstractResource;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.tm.tcf.protocol.IToken;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannel.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannel.java
index 11e8d1c4d2..4d0d3b51da 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannel.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannel.java
@@ -10,9 +10,9 @@
* Bernd Hufmann - Initial API and implementation
*
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tracecontrol.model.config;
+package org.eclipse.linuxtools.lttng.core.tracecontrol.model.config;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
/**
* <b><u>TraceChannel</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannels.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannels.java
index 9942f14656..808a5fe664 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannels.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannels.java
@@ -10,7 +10,7 @@
* Bernd Hufmann - Initial API and implementation
*
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tracecontrol.model.config;
+package org.eclipse.linuxtools.lttng.core.tracecontrol.model.config;
import java.util.Collection;
import java.util.HashMap;
@@ -18,8 +18,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
/**
* <b><u>TraceChannels</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceConfig.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceConfig.java
index a963fc06d7..f1308b7e28 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceConfig.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceConfig.java
@@ -11,7 +11,7 @@
* Bernd Hufmann - Productification, enhancements and fixes
*
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tracecontrol.model.config;
+package org.eclipse.linuxtools.lttng.core.tracecontrol.model.config;
import org.eclipse.core.resources.IProject;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/ILttControllerService.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/ILttControllerService.java
index 735e4eaaed..f7d73fa5dc 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/ILttControllerService.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/ILttControllerService.java
@@ -11,9 +11,9 @@
* Bernd Hufmann - Productification, enhancements and fixes
*
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tracecontrol.service;
+package org.eclipse.linuxtools.lttng.core.tracecontrol.service;
-import org.eclipse.linuxtools.lttng.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
import org.eclipse.tm.tcf.protocol.IService;
import org.eclipse.tm.tcf.protocol.IToken;
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/LttControllerServiceProxy.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/LttControllerServiceProxy.java
index 20f5ecf944..d647e03830 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/LttControllerServiceProxy.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/LttControllerServiceProxy.java
@@ -11,9 +11,9 @@
* Bernd Hufmann - Productification, enhancements and fixes
*
*******************************************************************************/
-package org.eclipse.linuxtools.lttng.tracecontrol.service;
+package org.eclipse.linuxtools.lttng.core.tracecontrol.service;
-import org.eclipse.linuxtools.lttng.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
import org.eclipse.tm.tcf.core.Command;
import org.eclipse.tm.tcf.core.ErrorReport;
import org.eclipse.tm.tcf.protocol.IChannel;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java
index 26e072e929..cdbccbd11f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java
@@ -14,10 +14,10 @@ package org.eclipse.linuxtools.lttng.stubs;
import java.io.IOException;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.parser.ITmfEventParser;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/**
* <b><u>TmfEventParserStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java
index 4ea5823488..dd4957643b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java
@@ -3,7 +3,7 @@
*/
package org.eclipse.linuxtools.lttng.stubs;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
/**
* @author francois
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java
index 50019de3e1..63b096b1d1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java
@@ -16,14 +16,14 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.parser.ITmfEventParser;
-import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
-import org.eclipse.linuxtools.tmf.trace.TmfTrace;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
/**
* <b><u>LTTngTraceStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java
index 8c2c89a627..ec1f5835b8 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java
@@ -19,10 +19,10 @@ import java.util.concurrent.TimeoutException;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.ProviderResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.model.TraceAdapterFactory;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java
index 4e5b4519e4..14729fadfd 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java
@@ -11,7 +11,7 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.model.trange;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
/**
* @author alvaro
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
index ca080c5b44..cd761b2558 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
@@ -12,11 +12,11 @@
package org.eclipse.linuxtools.lttng.ui.model.trange;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.model.LTTngCPUState;
-import org.eclipse.linuxtools.lttng.state.model.LttngIRQState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTrapState;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.model.LTTngCPUState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngIRQState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTrapState;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
/**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java
index 1a1ab977f4..67f0edc200 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java
@@ -15,13 +15,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.eclipse.linuxtools.lttng.state.StateStrings.BdevMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.CpuMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
-import org.eclipse.linuxtools.lttng.state.StateStrings.SoftIRQMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.TrapMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.BdevMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.CpuMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.SoftIRQMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.TrapMode;
import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisProvider;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
index 0bd835b956..f19f206393 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
@@ -22,8 +22,8 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java
index e3093f4373..324c856608 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java
@@ -21,12 +21,12 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java
index cb1c9a8e69..01be4b955f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java
@@ -22,11 +22,11 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java
index 78734eb15f..bba7854540 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
import org.eclipse.rse.core.model.ISystemRegistry;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java
index 4a4a7707e5..370fb857ff 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java
@@ -29,7 +29,7 @@ import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs.ImportTraceDialog;
import org.eclipse.rse.core.RSECorePlugin;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java
index f1572976fb..8bd85fc4ce 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java
@@ -21,9 +21,9 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java
index bc7becbbf6..2e6311b274 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java
@@ -23,10 +23,10 @@ import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java
index 83aac28445..ea7aa8d070 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java
@@ -21,10 +21,10 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java
index d90c168c8e..683bc31de5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java
@@ -20,11 +20,11 @@ import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.lttng.LttngConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.LttControllerServiceProxy;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.LttControllerServiceProxy;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.utility.DownloadProxy;
import org.eclipse.rse.core.model.IHost;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
index 09efe883f1..5f1c0df0dc 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
@@ -17,8 +17,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java
index 4e7f2677b2..4c8ac9e443 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java
@@ -17,9 +17,9 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.linuxtools.lttng.LTTngProjectNature;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.LTTngProjectNature;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.rse.ui.SystemBasePlugin;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java
index 517e9f12e2..5acc04bc16 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java
@@ -18,10 +18,10 @@ import java.io.File;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.linuxtools.lttng.LTTngProjectNature;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.lttng.core.LTTngProjectNature;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java
index 69ffb2409a..126ce365b3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java
index b821af7abf..bd5ac07cbc 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java
index 864835b204..1ce245ce85 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java
@@ -14,9 +14,9 @@
package org.eclipse.linuxtools.lttng.ui.tracecontrol.model;
import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.ProviderResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
import org.eclipse.rse.ui.view.AbstractSystemRemoteAdapterFactory;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.ui.views.properties.IPropertySource;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java
index 3e4674f155..86c6755c35 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java
@@ -21,9 +21,9 @@ import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.PropertyInfo;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.PropertyInfo;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java
index 03c7944b61..7a154e6c99 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java
@@ -13,8 +13,8 @@
package org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config;
import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards.KernelTraceChannelConfigurationPage;
import org.eclipse.swt.widgets.TableItem;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java
index d3e07cb250..1c93ad8f63 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
/**
* <b><u>TraceChannelTableContentProvider</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java
index 522d6bcc0e..c7093a9088 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.swt.graphics.Image;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
index 97d7d069d7..efefd3f867 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
@@ -20,14 +20,14 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.ProviderResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.LttControllerServiceProxy;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.LttControllerServiceProxy;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java
index 9544ceecc2..cd09409d6b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java
@@ -17,8 +17,8 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
import org.eclipse.rse.ui.SystemBasePlugin;
import org.eclipse.tm.tcf.protocol.JSON;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
index 4c6600070f..9ee805b426 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
@@ -17,11 +17,11 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig;
-import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java
index 1ddceab52a..486fa10b07 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java
@@ -13,7 +13,7 @@
package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards;
import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
public interface ITraceChannelConfigurationPage extends IWizardPage {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java
index 83410987da..1a90b4b2fe 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java
@@ -29,9 +29,9 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config.TraceChannelCellModifier;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java
index 96e9d63950..8b0b5510f6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java
@@ -15,9 +15,9 @@ package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards;
import java.io.File;
import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java
index 7a9ea8d3c5..e928a0def9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java
@@ -13,8 +13,8 @@
package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards;
import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel;
+import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels;
import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.VerifyEvent;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java
index 57cd0e9248..319f0a2684 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.views.common;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.evProcessor.state.AbsStateProcessing;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.state.AbsStateProcessing;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
public abstract class AbsTRangeUpdate extends AbsStateProcessing implements
ILttngEventProcessor {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java
index 4af80963c7..9fab6d2a36 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java
@@ -14,30 +14,30 @@ package org.eclipse.linuxtools.lttng.ui.views.common;
import java.util.Arrays;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.control.LttngSyntheticEventProvider;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.request.IRequestStatusListener;
-import org.eclipse.linuxtools.lttng.request.LttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.request.RequestCompletedSignal;
-import org.eclipse.linuxtools.lttng.request.RequestStartedSignal;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.lttng.core.control.LttngSyntheticEventProvider;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest;
+import org.eclipse.linuxtools.lttng.core.request.IRequestStatusListener;
+import org.eclipse.linuxtools.lttng.core.request.LttngSyntEventRequest;
+import org.eclipse.linuxtools.lttng.core.request.RequestCompletedSignal;
+import org.eclipse.linuxtools.lttng.core.request.RequestStartedSignal;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentDisposedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
-import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+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.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager;
+import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITimeAnalysisViewer;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeScaleSelectionEvent;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeSelectionEvent;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java
index d78b39688c..5f3b76d368 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java
@@ -11,10 +11,10 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.views.common;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeScaleSelectionEvent;
/**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java
index b9963f2620..2a4c345fa1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java
@@ -35,10 +35,10 @@ import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
-import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor;
+import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp;
+import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
@@ -47,15 +47,15 @@ import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
import org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor.FlowEventToHandlerFactory;
import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowModelFactory;
import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowTimeRangeViewerProvider;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal;
import org.eclipse.linuxtools.tmf.ui.viewers.TmfViewerFactory;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeFilterSelectionListener;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeScaleSelectionListener;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java
index 430d5f4d18..3e920c97cf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java
@@ -14,10 +14,10 @@ package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
import java.util.Vector;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java
index 98c74bf91b..644352f29b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java
@@ -12,14 +12,14 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
/**
* Creates instances of specific after state update handlers, per corresponding
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java
index a53aacdcc0..be0a9bafb1 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java
@@ -12,14 +12,14 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
/**
* Creates instances of specific before state update handlers, per corresponding
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java
index 43e5a05476..e1aa9d2662 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java
@@ -15,9 +15,9 @@ package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventToHandlerResolver;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
/**
* Builds a Map from string event name to a processing handler object, the
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java
index 4d8fadcfba..b7efd6d429 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java
@@ -14,11 +14,11 @@ package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor;
import java.util.Vector;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java
index 1fc17b18f9..f3b0053f8f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java
@@ -15,7 +15,7 @@ package org.eclipse.linuxtools.lttng.ui.views.controlflow.model;
import java.util.HashMap;
import java.util.Iterator;
-import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java
index c1c4a04bf0..c5e149bad6 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java
@@ -13,9 +13,9 @@
package org.eclipse.linuxtools.lttng.ui.views.events;
-import org.eclipse.linuxtools.lttng.event.LttngEventContent;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;
+import org.eclipse.linuxtools.lttng.core.event.LttngEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable;
import org.eclipse.linuxtools.tmf.ui.widgets.ColumnData;
import org.eclipse.swt.SWT;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java
index b08690116f..36c6fb748c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.lttng.ui.views.histogram;
import java.util.Arrays;
-import org.eclipse.linuxtools.lttng.exceptions.EventOutOfSequenceException;
+import org.eclipse.linuxtools.lttng.core.exceptions.EventOutOfSequenceException;
import org.eclipse.linuxtools.lttng.ui.LTTngUILogger;
/**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java
index be2fa6d471..2b88329570 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java
@@ -14,11 +14,11 @@
package org.eclipse.linuxtools.lttng.ui.views.histogram;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
/**
* <b><u>HistogramRequest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java
index 82c7294923..32f9dc11bf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java
@@ -16,17 +16,17 @@
package org.eclipse.linuxtools.lttng.ui.views.histogram;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
-import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+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.request.ITmfDataRequest.ExecutionType;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager;
+import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal;
import org.eclipse.linuxtools.tmf.ui.views.TmfView;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java
index 98f7834903..9d15e106c0 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java
@@ -28,10 +28,10 @@ import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.linuxtools.lttng.TraceHelper;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.trace.LTTngExperiment;
-import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
+import org.eclipse.linuxtools.lttng.core.TraceHelper;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngExperiment;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace;
import org.eclipse.linuxtools.lttng.ui.views.project.dialogs.Messages;
import org.eclipse.linuxtools.lttng.ui.views.project.model.ILTTngProjectTreeNode;
import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngExperimentNode;
@@ -40,9 +40,9 @@ import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectLabelProv
import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectRoot;
import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngTraceNode;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
import org.eclipse.linuxtools.tmf.ui.views.TmfView;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseAdapter;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java
index 2132ed37c3..b16c168a99 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java
@@ -17,9 +17,9 @@ import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.linuxtools.lttng.TraceHelper;
-import org.eclipse.linuxtools.lttng.exceptions.LttngException;
-import org.eclipse.linuxtools.lttng.trace.LTTngTraceVersion;
+import org.eclipse.linuxtools.lttng.core.TraceHelper;
+import org.eclipse.linuxtools.lttng.core.exceptions.LttngException;
+import org.eclipse.linuxtools.lttng.core.trace.LTTngTraceVersion;
import org.eclipse.linuxtools.lttng.ui.views.project.handlers.TraceErrorHandler;
import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode;
import org.eclipse.ui.IWorkbench;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewLTTngProjectWizard.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewLTTngProjectWizard.java
index b7113bc1b0..ed0a21f155 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewLTTngProjectWizard.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewLTTngProjectWizard.java
@@ -17,9 +17,9 @@ package org.eclipse.linuxtools.lttng.ui.views.project.dialogs;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.linuxtools.lttng.LTTngProjectNature;
-import org.eclipse.linuxtools.lttng.TraceHelper;
-import org.eclipse.linuxtools.tmf.TmfProjectNature;
+import org.eclipse.linuxtools.lttng.core.LTTngProjectNature;
+import org.eclipse.linuxtools.lttng.core.TraceHelper;
+import org.eclipse.linuxtools.tmf.core.TmfProjectNature;
import org.eclipse.linuxtools.tmf.ui.project.wizards.NewTmfProjectWizard;
/**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceLibraryPathPropertyPage.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceLibraryPathPropertyPage.java
index 21c015f01c..bd99112350 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceLibraryPathPropertyPage.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceLibraryPathPropertyPage.java
@@ -16,7 +16,7 @@ import java.io.File;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.linuxtools.lttng.TraceHelper;
+import org.eclipse.linuxtools.lttng.core.TraceHelper;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java
index 8898a10a9d..07648dd878 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java
@@ -22,7 +22,7 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.linuxtools.lttng.LTTngProjectNature;
+import org.eclipse.linuxtools.lttng.core.LTTngProjectNature;
/**
* <b><u>LTTngProjectNode</u></b>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
index 8432a5d009..062b566e26 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
@@ -18,9 +18,9 @@ import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor;
+import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
import org.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView;
@@ -28,15 +28,15 @@ import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
import org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor.ResourcesEventToHandlerFactory;
import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceModelFactory;
import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourcesTimeRangeViewerProvider;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal;
import org.eclipse.linuxtools.tmf.ui.viewers.TmfViewerFactory;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeScaleSelectionListener;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeSelectionListener;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java
index 235a2d68c6..dfabba081a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java
@@ -14,9 +14,9 @@ package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
import java.util.Vector;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent;
@@ -28,7 +28,7 @@ import org.eclipse.linuxtools.lttng.ui.views.common.AbsTRangeUpdate;
import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater;
import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceContainer;
import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceModelFactory;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
public abstract class AbsResourcesTRangeUpdate extends AbsTRangeUpdate
implements ILttngEventProcessor {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java
index 85a012e6f3..4c48c96965 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java
@@ -12,9 +12,9 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
/**
* Creates instances of specific after state update handlers, per corresponding
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java
index f840e62e10..f45fa0b825 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java
@@ -12,15 +12,15 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Channels;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Fields;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Channels;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
/**
* Creates instances of specific before state update handlers, per corresponding
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java
index a42caf962e..2a068d8142 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java
@@ -15,13 +15,13 @@ package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
-import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent.SequenceInd;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventToHandlerResolver;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent;
+import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
/**
* Builds a Map from string event name to a processing handler object, the
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java
index 46ab86b3ab..3bcc934edc 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java
@@ -12,10 +12,10 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java
index 7665fdd85a..d32700fbf3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java
@@ -15,7 +15,7 @@ package org.eclipse.linuxtools.lttng.ui.views.resources.model;
import java.util.HashMap;
import java.util.Iterator;
-import org.eclipse.linuxtools.lttng.TraceDebug;
+import org.eclipse.linuxtools.lttng.core.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource;
import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java
index 0a6b6d0c0d..4ca1fef949 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java
@@ -27,12 +27,12 @@ import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.TreeViewerColumn;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.model.LTTngTreeNode;
-import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest;
-import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventToHandlerResolver;
-import org.eclipse.linuxtools.lttng.state.experiment.StateManagerFactory;
+import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode;
+import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
+import org.eclipse.linuxtools.lttng.core.state.experiment.StateManagerFactory;
import org.eclipse.linuxtools.lttng.ui.TraceDebug;
import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer;
import org.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView;
@@ -41,14 +41,14 @@ import org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor.StatsTimeCou
import org.eclipse.linuxtools.lttng.ui.views.statistics.model.KernelStatisticsData;
import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeNode;
import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeRootFactory;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java
index 7aec59ac33..342b7f225b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java
@@ -11,10 +11,10 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData;
import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeRootFactory;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java
index 0e88e0a45d..79ce191ebb 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java
@@ -12,9 +12,9 @@
package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData;
class StatsModeChangeHandler extends AbstractStatsEventHandler {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java
index 7cb5d035cb..4a5b2dc07c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java
@@ -12,9 +12,9 @@
package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData;
class StatsModeEndHandler extends AbstractStatsEventHandler {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java
index 15e51dbe23..5dc5f26e4f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java
@@ -12,9 +12,9 @@
package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData;
/**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java
index 06aea15aa8..f6a0c928e3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java
@@ -16,9 +16,9 @@ package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventToHandlerResolver;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
/**
* Provide the handlers that will count the CPU Time, Cumulative CPU Time and
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java
index d1583b0f6f..109c8f7e31 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java
@@ -12,11 +12,11 @@
package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
/**
* Process the system call entry event
@@ -186,7 +186,7 @@ class StatsTimeCountHandlers {
}
/**
* <h4>Get the process exit handler</h4>
- * <p> Handles: {@link org.eclipse.linuxtools.lttng.state.StateStrings.Events#LTT_EVENT_PROCESS_EXIT}.</p>
+ * <p> Handles: {@link org.eclipse.linuxtools.lttng.core.state.StateStrings.Events#LTT_EVENT_PROCESS_EXIT}.</p>
* @return The handler.
*/
ILttngEventProcessor getProcessExitHandler() {
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java
index d301b9417b..658e7bdfc9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java
@@ -12,8 +12,8 @@
package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData;
/**
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java
index 276eaceb20..79d18664d5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java
@@ -19,13 +19,13 @@ import java.util.LinkedList;
import java.util.Set;
import java.util.Map;
-import org.eclipse.linuxtools.lttng.LttngConstants;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.StateStrings.Events;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode;
-import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus;
-import org.eclipse.linuxtools.lttng.state.model.LttngProcessState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.LttngConstants;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
/**
* <h4>Class that process the LTTng kernel events.</h4>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java
index 7589782948..523aa583fa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java
@@ -17,8 +17,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
/**
* <h4>Base class for the statistics storage.</h4>
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java
index a7fb535a56..50aef66712 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java
@@ -12,8 +12,8 @@
package org.eclipse.linuxtools.lttng.ui.views.timeframe;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java
index ab59b1e08b..09b031c276 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java
@@ -12,15 +12,15 @@
package org.eclipse.linuxtools.lttng.ui.views.timeframe;
-import org.eclipse.linuxtools.lttng.event.LttngEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentUpdatedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;
+import org.eclipse.linuxtools.lttng.core.event.LttngEvent;
+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.signal.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal;
import org.eclipse.linuxtools.tmf.ui.views.TmfView;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
diff --git a/lttng/org.eclipse.linuxtools.lttng.tests/.gitignore b/lttng/org.eclipse.linuxtools.lttng/.gitignore
index 8d94ef8deb..8d94ef8deb 100644
--- a/lttng/org.eclipse.linuxtools.lttng.tests/.gitignore
+++ b/lttng/org.eclipse.linuxtools.lttng/.gitignore
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/.project b/lttng/org.eclipse.linuxtools.lttng/.project
index b7a86a0c44..b7a86a0c44 100644
--- a/lttng/org.eclipse.linuxtools.lttng-feature/.project
+++ b/lttng/org.eclipse.linuxtools.lttng/.project
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/build.properties b/lttng/org.eclipse.linuxtools.lttng/build.properties
index 39b0777e50..39b0777e50 100644
--- a/lttng/org.eclipse.linuxtools.lttng-feature/build.properties
+++ b/lttng/org.eclipse.linuxtools.lttng/build.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/epl-v10.html b/lttng/org.eclipse.linuxtools.lttng/epl-v10.html
index 9321f4082e..9321f4082e 100644
--- a/lttng/org.eclipse.linuxtools.lttng-feature/epl-v10.html
+++ b/lttng/org.eclipse.linuxtools.lttng/epl-v10.html
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/feature.properties b/lttng/org.eclipse.linuxtools.lttng/feature.properties
index 3cad903448..3cad903448 100644
--- a/lttng/org.eclipse.linuxtools.lttng-feature/feature.properties
+++ b/lttng/org.eclipse.linuxtools.lttng/feature.properties
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/feature.xml b/lttng/org.eclipse.linuxtools.lttng/feature.xml
index 0b38b5bb87..0b38b5bb87 100644
--- a/lttng/org.eclipse.linuxtools.lttng-feature/feature.xml
+++ b/lttng/org.eclipse.linuxtools.lttng/feature.xml
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/license.html b/lttng/org.eclipse.linuxtools.lttng/license.html
index 6e579a585b..6e579a585b 100644
--- a/lttng/org.eclipse.linuxtools.lttng-feature/license.html
+++ b/lttng/org.eclipse.linuxtools.lttng/license.html
diff --git a/lttng/org.eclipse.linuxtools.lttng-feature/pom.xml b/lttng/org.eclipse.linuxtools.lttng/pom.xml
index d86c8fc1b8..d86c8fc1b8 100644
--- a/lttng/org.eclipse.linuxtools.lttng-feature/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng/pom.xml
diff --git a/lttng/org.eclipse.linuxtools.tmf-feature/.project b/lttng/org.eclipse.linuxtools.tmf-feature/.project
deleted file mode 100644
index edaa96d626..0000000000
--- a/lttng/org.eclipse.linuxtools.tmf-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.tmf</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.tmf-feature/ChangeLog b/lttng/org.eclipse.linuxtools.tmf-feature/ChangeLog
deleted file mode 100644
index 592ef772d3..0000000000
--- a/lttng/org.eclipse.linuxtools.tmf-feature/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2011-06-02 Andrew Overholt <overholt@redhat.com>
-
- * build.properties: Include license.html.
-
-2011-02-04 Jeff Johnston <jjohnstn@redhat.com>
-
- * feature.properties: Fix license to be consistent with other tools. \ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf-feature/build.properties b/lttng/org.eclipse.linuxtools.tmf-feature/build.properties
deleted file mode 100644
index 39b0777e50..0000000000
--- a/lttng/org.eclipse.linuxtools.tmf-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
- epl-v10.html,\
- feature.properties,\
- license.html
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/.classpath b/lttng/org.eclipse.linuxtools.tmf.core.tests/.classpath
index 2a987e2854..2a987e2854 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/.classpath
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/.classpath
diff --git a/lttng/org.eclipse.linuxtools.tmf-feature/.gitignore b/lttng/org.eclipse.linuxtools.tmf.core.tests/.gitignore
index 8d94ef8deb..8d94ef8deb 100644
--- a/lttng/org.eclipse.linuxtools.tmf-feature/.gitignore
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/.gitignore
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/.options b/lttng/org.eclipse.linuxtools.tmf.core.tests/.options
index 290591c805..290591c805 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/.options
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/.options
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/.project b/lttng/org.eclipse.linuxtools.tmf.core.tests/.project
index 64d3b0f3b3..64d3b0f3b3 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/.project
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/.project
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/.settings/org.eclipse.jdt.core.prefs b/lttng/org.eclipse.linuxtools.tmf.core.tests/.settings/org.eclipse.jdt.core.prefs
index d97d6692bb..d97d6692bb 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/ChangeLog b/lttng/org.eclipse.linuxtools.tmf.core.tests/ChangeLog
index abccc44d31..abccc44d31 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/ChangeLog
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/ChangeLog
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
index 40a47cb2ab..e87990eb49 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Require-Bundle: org.junit;bundle-version="3.8.2",
org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0"
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin
-Export-Package: org.eclipse.linuxtools.tmf.trace;x-friends:="org.eclipse.linuxtools.tmf.ui.tests"
+Bundle-Activator: org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin
+Export-Package: org.eclipse.linuxtools.tmf.stubs.trace;x-friends:="org.eclipse.linuxtools.tmf.ui.tests"
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/build.properties b/lttng/org.eclipse.linuxtools.tmf.core.tests/build.properties
index 686ec8fb3f..686ec8fb3f 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/build.properties
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/build.properties
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/plugin.properties b/lttng/org.eclipse.linuxtools.tmf.core.tests/plugin.properties
index c92c109958..c92c109958 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/plugin.properties
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/plugin.properties
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/pom.xml b/lttng/org.eclipse.linuxtools.tmf.core.tests/pom.xml
index f3438d6806..60530b8708 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/pom.xml
@@ -42,7 +42,7 @@
<version>${tycho-version}</version>
<configuration>
<testSuite>org.eclipse.linuxtools.tmf.core.tests</testSuite>
- <testClass>org.eclipse.linuxtools.tmf.tests.AllTmfCoreTests</testClass>
+ <testClass>org.eclipse.linuxtools.tmf.core.tests.AllTmfCoreTests</testClass>
<useUIHarness>false</useUIHarness>
<useUIThread>false</useUIThread>
<product>org.eclipse.sdk.ide</product>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/AllTmfCoreTests.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/AllTmfCoreTests.java
index c4ffe5569c..412c7942ec 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/AllTmfCoreTests.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/AllTmfCoreTests.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests;
+package org.eclipse.linuxtools.tmf.core.tests;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -26,13 +26,13 @@ public class AllTmfCoreTests {
TestSuite suite = new TestSuite(AllTmfCoreTests.class.getName());
//$JUnit-BEGIN$
suite.addTestSuite(TmfCorePluginTest.class);
- suite.addTest(org.eclipse.linuxtools.tmf.tests.event.AllTests.suite());
- suite.addTest(org.eclipse.linuxtools.tmf.tests.request.AllTests.suite());
- suite.addTest(org.eclipse.linuxtools.tmf.tests.component.AllTests.suite());
- suite.addTest(org.eclipse.linuxtools.tmf.tests.trace.AllTests.suite());
- suite.addTest(org.eclipse.linuxtools.tmf.tests.experiment.AllTests.suite());
- suite.addTest(org.eclipse.linuxtools.tmf.tests.uml2sd.AllTests.suite());
- suite.addTest(org.eclipse.linuxtools.tmf.tests.util.AllTests.suite());
+ suite.addTest(org.eclipse.linuxtools.tmf.core.tests.event.AllTests.suite());
+ suite.addTest(org.eclipse.linuxtools.tmf.core.tests.request.AllTests.suite());
+ suite.addTest(org.eclipse.linuxtools.tmf.core.tests.component.AllTests.suite());
+ suite.addTest(org.eclipse.linuxtools.tmf.core.tests.trace.AllTests.suite());
+ suite.addTest(org.eclipse.linuxtools.tmf.core.tests.experiment.AllTests.suite());
+ suite.addTest(org.eclipse.linuxtools.tmf.core.tests.uml2sd.AllTests.suite());
+ suite.addTest(org.eclipse.linuxtools.tmf.core.tests.util.AllTests.suite());
//$JUnit-END$
return suite;
}
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java
index 068ae1ed3c..fe5e6337f8 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java
@@ -10,9 +10,9 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests;
+package org.eclipse.linuxtools.tmf.core.tests;
-import org.eclipse.linuxtools.tmf.TmfCorePlugin;
+import org.eclipse.linuxtools.tmf.core.TmfCorePlugin;
import junit.framework.TestCase;
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java
index 316e7fc567..1461d9e6d5 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests;
+package org.eclipse.linuxtools.tmf.core.tests;
import org.eclipse.core.runtime.Plugin;
-import org.eclipse.linuxtools.tmf.Tracer;
+import org.eclipse.linuxtools.tmf.core.Tracer;
import org.osgi.framework.BundleContext;
/**
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/AllTests.java
index 78a0532399..e14d8da389 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/AllTests.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/AllTests.java
@@ -1,4 +1,4 @@
-package org.eclipse.linuxtools.tmf.tests.component;
+package org.eclipse.linuxtools.tmf.core.tests.component;
import junit.framework.Test;
import junit.framework.TestSuite;
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java
index b4b3068c99..9f4402855a 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java
@@ -10,25 +10,25 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.component;
+package org.eclipse.linuxtools.tmf.core.tests.component;
import java.io.IOException;
import java.util.Vector;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;
-import org.eclipse.linuxtools.tmf.component.TmfEventProviderStub;
-import org.eclipse.linuxtools.tmf.component.TmfProviderManager;
-import org.eclipse.linuxtools.tmf.component.TmfSyntheticEventProviderStub;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfSyntheticEventStub;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.signal.TmfEndSynchSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfStartSynchSignal;
-import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;
+import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.signal.TmfEndSynchSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfStartSynchSignal;
+import org.eclipse.linuxtools.tmf.stubs.component.TmfEventProviderStub;
+import org.eclipse.linuxtools.tmf.stubs.component.TmfSyntheticEventProviderStub;
+import org.eclipse.linuxtools.tmf.stubs.event.TmfSyntheticEventStub;
+import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub;
/**
* <b><u>TmfClientTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java
index 366816f775..1e6bb55a1c 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java
@@ -10,15 +10,15 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.component;
+package org.eclipse.linuxtools.tmf.core.tests.component;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.component.TmfDataProvider;
-import org.eclipse.linuxtools.tmf.component.TmfProviderManager;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.core.component.TmfDataProvider;
+import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
/**
* <b><u>TmfProviderManagerTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java
index f046694f87..928149c1bd 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.tmf.tests.event;
+package org.eclipse.linuxtools.tmf.core.tests.event;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.linuxtools.tmf.TmfCorePlugin;
+import org.eclipse.linuxtools.tmf.core.TmfCorePlugin;
@SuppressWarnings("nls")
public class AllTests {
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventContentTest.java
index fbfbf6121c..f8d39933e2 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventContentTest.java
@@ -10,19 +10,19 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.event;
+package org.eclipse.linuxtools.tmf.core.tests.event;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;
-import org.eclipse.linuxtools.tmf.event.TmfEventContentStub;
-import org.eclipse.linuxtools.tmf.event.TmfEventReference;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.event.TmfEventType;
-import org.eclipse.linuxtools.tmf.event.TmfEventTypeStub;
-import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.stubs.event.TmfEventContentStub;
+import org.eclipse.linuxtools.tmf.stubs.event.TmfEventTypeStub;
/**
* <b><u>TmfEventContentTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java
index 8db604588e..b746475743 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java
@@ -10,18 +10,18 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.event;
+package org.eclipse.linuxtools.tmf.core.tests.event;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;
-import org.eclipse.linuxtools.tmf.event.TmfEventField;
-import org.eclipse.linuxtools.tmf.event.TmfEventReference;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.event.TmfEventType;
-import org.eclipse.linuxtools.tmf.event.TmfEventTypeStub;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.stubs.event.TmfEventTypeStub;
/**
* <b><u>TmfEventFieldTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventReferenceTest.java
index 1f350b6d04..ba25db2e73 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventReferenceTest.java
@@ -10,11 +10,11 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.event;
+package org.eclipse.linuxtools.tmf.core.tests.event;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventReference;
/**
* <b><u>TmfEventReferenceTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventSourceTest.java
index e2b7a6ec1b..341e2b9e77 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventSourceTest.java
@@ -10,11 +10,11 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.event;
+package org.eclipse.linuxtools.tmf.core.tests.event;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
/**
* <b><u>TmfEventSourceTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java
index 7691ba0806..ec55b14bf9 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java
@@ -10,16 +10,16 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.event;
+package org.eclipse.linuxtools.tmf.core.tests.event;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;
-import org.eclipse.linuxtools.tmf.event.TmfEventReference;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.event.TmfEventType;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
/**
* <b><u>TmfEventTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java
index 355e1ca764..4715551c12 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java
@@ -10,12 +10,12 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.event;
+package org.eclipse.linuxtools.tmf.core.tests.event;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEventType;
-import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException;
/**
* <b><u>TmfEventTypeTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java
index 1bf85eb819..283894a2db 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.event;
+package org.eclipse.linuxtools.tmf.core.tests.event;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
import junit.framework.TestCase;
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java
index f3b7503634..5f7d6307b4 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java
@@ -10,11 +10,11 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.event;
+package org.eclipse.linuxtools.tmf.core.tests.event;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
/**
* <b><u>TmfTimestampTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTraceEventTest.java
index 6b3fd2177b..c34f56c031 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTraceEventTest.java
@@ -10,14 +10,14 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.event;
-
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;
-import org.eclipse.linuxtools.tmf.event.TmfEventReference;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.event.TmfEventType;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.event.TmfTraceEvent;
+package org.eclipse.linuxtools.tmf.core.tests.event;
+
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfTraceEvent;
import junit.framework.TestCase;
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/AllTests.java
index 8f706c2de1..cf146400ba 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/AllTests.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.tmf.tests.experiment;
+package org.eclipse.linuxtools.tmf.core.tests.experiment;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.linuxtools.tmf.TmfCorePlugin;
+import org.eclipse.linuxtools.tmf.core.TmfCorePlugin;
@SuppressWarnings("nls")
public class AllTests {
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java
index 0ece3d3aa2..4bad45758b 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.experiment;
+package org.eclipse.linuxtools.tmf.core.tests.experiment;
import java.io.File;
import java.io.IOException;
@@ -22,18 +22,18 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperimentContext;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+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.experiment.TmfExperimentContext;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub;
/**
* <b><u>TmfExperimentTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java
index 98d8fb9788..66acdca0a0 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.experiment;
+package org.eclipse.linuxtools.tmf.core.tests.experiment;
import java.io.File;
import java.io.IOException;
@@ -22,18 +22,18 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperimentContext;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+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.experiment.TmfExperimentContext;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub;
/**
* <b><u>TmfExperimentTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java
index 8fe1686ecb..5e25ec4792 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.tmf.tests.request;
+package org.eclipse.linuxtools.tmf.core.tests.request;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.linuxtools.tmf.TmfCorePlugin;
+import org.eclipse.linuxtools.tmf.core.TmfCorePlugin;
@SuppressWarnings("nls")
public class AllTests {
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java
index db023abe07..908b1128d8 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java
@@ -10,15 +10,15 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.request;
+package org.eclipse.linuxtools.tmf.core.tests.request;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.request.TmfCoalescedDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequestStub;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.stubs.request.TmfDataRequestStub;
/**
* <b><u>TmfCoalescedDataRequestTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java
index d97af006f0..7b7bea6c5b 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.request;
+package org.eclipse.linuxtools.tmf.core.tests.request;
import java.io.File;
import java.io.IOException;
@@ -22,20 +22,20 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;
-import org.eclipse.linuxtools.tmf.component.TmfProviderManager;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.request.TmfCoalescedDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfCoalescedEventRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequestStub;
-import org.eclipse.linuxtools.tmf.signal.TmfSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
-import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
-import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;
+import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedEventRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager;
+import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.stubs.request.TmfEventRequestStub;
+import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub;
/**
* <b><u>TmfCoalescedEventRequestTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java
index 9f879da557..fd3727a649 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java
@@ -10,13 +10,13 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.request;
+package org.eclipse.linuxtools.tmf.core.tests.request;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequestStub;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.stubs.request.TmfDataRequestStub;
/**
* <b><u>TmfDataRequestTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java
index ec6170169c..3a00d9c5bd 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java
@@ -10,16 +10,16 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.request;
+package org.eclipse.linuxtools.tmf.core.tests.request;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequestStub;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.stubs.request.TmfEventRequestStub;
/**
* <b><u>TmfEventRequestTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfRequestExecutorTest.java
index d490435d41..59949487ea 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfRequestExecutorTest.java
@@ -10,13 +10,13 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.request;
+package org.eclipse.linuxtools.tmf.core.tests.request;
import java.util.concurrent.Executors;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.request.TmfRequestExecutor;
+import org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor;
/**
* <b><u>TmfRequestExecutorTest</u></b>
@@ -56,7 +56,7 @@ public class TmfRequestExecutorTest extends TestCase {
// ------------------------------------------------------------------------
/**
- * Test method for {@link org.eclipse.linuxtools.tmf.request.TmfRequestExecutor#TmfRequestExecutor()}.
+ * Test method for {@link org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor#TmfRequestExecutor()}.
*/
public void testTmfRequestExecutor() {
TmfRequestExecutor executor = new TmfRequestExecutor();
@@ -66,7 +66,7 @@ public class TmfRequestExecutorTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.linuxtools.tmf.request.TmfRequestExecutor#TmfRequestExecutor(java.util.concurrent.ExecutorService)}.
+ * Test method for {@link org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor#TmfRequestExecutor(java.util.concurrent.ExecutorService)}.
*/
public void testTmfRequestExecutorExecutorService() {
TmfRequestExecutor executor = new TmfRequestExecutor(Executors.newCachedThreadPool());
@@ -76,7 +76,7 @@ public class TmfRequestExecutorTest extends TestCase {
}
/**
- * Test method for {@link org.eclipse.linuxtools.tmf.request.TmfRequestExecutor#stop()}.
+ * Test method for {@link org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor#stop()}.
*/
public void testStop() {
TmfRequestExecutor executor = new TmfRequestExecutor();
@@ -91,7 +91,7 @@ public class TmfRequestExecutorTest extends TestCase {
// ------------------------------------------------------------------------
/**
- * Test method for {@link org.eclipse.linuxtools.tmf.request.TmfRequestExecutor#execute(java.lang.Runnable)}.
+ * Test method for {@link org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor#execute(java.lang.Runnable)}.
*/
public void testExecute() {
// fail("Not yet implemented");
@@ -102,7 +102,7 @@ public class TmfRequestExecutorTest extends TestCase {
// ------------------------------------------------------------------------
/**
- * Test method for {@link org.eclipse.linuxtools.tmf.request.TmfRequestExecutor#toString()}.
+ * Test method for {@link org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor#toString()}.
*/
public void testToString() {
// TmfRequestExecutor executor1 = new TmfRequestExecutor();
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java
index 570f4cecc5..c046cbcb32 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.tmf.tests.trace;
+package org.eclipse.linuxtools.tmf.core.tests.trace;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.linuxtools.tmf.TmfCorePlugin;
+import org.eclipse.linuxtools.tmf.core.TmfCorePlugin;
@SuppressWarnings("nls")
public class AllTests {
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java
index 5865a257b9..31eaf26421 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java
@@ -10,13 +10,13 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.trace;
+package org.eclipse.linuxtools.tmf.core.tests.trace;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
/**
* <b><u>TmfCheckpointTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfContextTest.java
index 50bdc47d4c..3f6e2620ba 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfContextTest.java
@@ -10,13 +10,13 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.trace;
+package org.eclipse.linuxtools.tmf.core.tests.trace;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
/**
* <b><u>TmfContextTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java
index 6ec86ce343..a764ead99f 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.trace;
+package org.eclipse.linuxtools.tmf.core.tests.trace;
import java.io.File;
import java.io.IOException;
@@ -22,17 +22,17 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperimentContext;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+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.experiment.TmfExperimentContext;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub;
/**
* <b><u>TmfExperimentTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java
index d811ace6e7..ccc57b1f74 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java
@@ -10,12 +10,12 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.trace;
+package org.eclipse.linuxtools.tmf.core.tests.trace;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
/**
* <b><u>TmfLocationTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
index 2bc01e5235..222fdf981b 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.trace;
+package org.eclipse.linuxtools.tmf.core.tests.trace;
import java.io.File;
import java.io.IOException;
@@ -22,18 +22,18 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;
-import org.eclipse.linuxtools.tmf.component.TmfProviderManager;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;
+import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
+import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub;
/**
* <b><u>TmfTraceTest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java
index dd62f3d684..638452450c 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/AllTests.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.tmf.tests.uml2sd;
+package org.eclipse.linuxtools.tmf.core.tests.uml2sd;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.linuxtools.tmf.TmfCorePlugin;
+import org.eclipse.linuxtools.tmf.core.TmfCorePlugin;
@SuppressWarnings("nls")
public class AllTests {
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java
index 2293130065..d995b5e34c 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java
@@ -9,17 +9,17 @@
* Contributors:
* Bernd Hufmann - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.uml2sd;
+package org.eclipse.linuxtools.tmf.core.tests.uml2sd;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;
-import org.eclipse.linuxtools.tmf.event.TmfEventReference;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.event.TmfEventType;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.uml2sd.TmfAsyncSequenceDiagramEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.uml2sd.TmfAsyncSequenceDiagramEvent;
@SuppressWarnings("nls")
public class TmfAsyncSequenceDiagramEventTest extends TestCase {
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java
index 7941aaf30c..8b2557081e 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java
@@ -9,17 +9,17 @@
* Contributors:
* Bernd Hufmann - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.uml2sd;
+package org.eclipse.linuxtools.tmf.core.tests.uml2sd;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;
-import org.eclipse.linuxtools.tmf.event.TmfEventReference;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.event.TmfEventType;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.uml2sd.TmfSyncSequenceDiagramEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.uml2sd.TmfSyncSequenceDiagramEvent;
@SuppressWarnings("nls")
public class TmfSyncSequenceDiagramEventTest extends TestCase {
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/AllTests.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java
index 537bdc5b88..ed809931ba 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/AllTests.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java
@@ -1,9 +1,9 @@
-package org.eclipse.linuxtools.tmf.tests.util;
+package org.eclipse.linuxtools.tmf.core.tests.util;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.linuxtools.tmf.TmfCorePlugin;
+import org.eclipse.linuxtools.tmf.core.TmfCorePlugin;
@SuppressWarnings("nls")
public class AllTests {
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/TmfFixedArrayTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java
index 076a6c2c68..2de859f062 100755
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/TmfFixedArrayTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java
@@ -10,13 +10,13 @@
* Mathieu Denis (mathieu.denis@polymtl.ca) - Initial design and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.tests.util;
+package org.eclipse.linuxtools.tmf.core.tests.util;
import java.util.Arrays;
import junit.framework.TestCase;
-import org.eclipse.linuxtools.tmf.util.TmfFixedArray;
+import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray;
public class TmfFixedArrayTest extends TestCase {
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/CreateTestFiles.java
index c4c438db75..1a896ba392 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/CreateTestFiles.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf;
+package org.eclipse.linuxtools.tmf.stubs;
import java.io.BufferedOutputStream;
import java.io.DataOutputStream;
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfClientStub.java
index 8ce79737ea..bd8c506866 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfClientStub.java
@@ -10,9 +10,12 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.component;
+package org.eclipse.linuxtools.tmf.stubs.component;
-import org.eclipse.linuxtools.tmf.event.TmfSyntheticEventStub;
+import org.eclipse.linuxtools.tmf.core.component.TmfComponent;
+import org.eclipse.linuxtools.tmf.core.component.TmfDataProvider;
+import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager;
+import org.eclipse.linuxtools.tmf.stubs.event.TmfSyntheticEventStub;
/**
* <b><u>TmfClientStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfDataProviderStub.java
index 2df7db7d6d..a238f023ba 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfDataProviderStub.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.component;
+package org.eclipse.linuxtools.tmf.stubs.component;
import java.io.File;
import java.io.IOException;
@@ -19,12 +19,13 @@ import java.net.URL;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.tmf.event.TmfData;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.ITmfEventRequest;
-import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+import org.eclipse.linuxtools.tmf.core.component.TmfDataProvider;
+import org.eclipse.linuxtools.tmf.core.event.TmfData;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub;
/**
* <b><u>TmfDataProviderStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfEventProviderStub.java
index 10dbe9fb1c..75d78e4daa 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfEventProviderStub.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.component;
+package org.eclipse.linuxtools.tmf.stubs.component;
import java.io.File;
import java.io.IOException;
@@ -19,12 +19,13 @@ import java.net.URL;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.ITmfEventRequest;
-import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
+import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub;
/**
* <b><u>TmfEventProviderStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfSyntheticEventProviderStub.java
index b1e062584c..fcea703eb2 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfSyntheticEventProviderStub.java
@@ -10,18 +10,21 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.component;
+package org.eclipse.linuxtools.tmf.stubs.component;
import java.util.concurrent.TimeUnit;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfSyntheticEventStub;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.ITmfEventRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;
+import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider;
+import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.stubs.event.TmfSyntheticEventStub;
/**
* <b><u>TmfSyntheticEventProviderStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventContentStub.java
index 97f87cc3af..59576b55ce 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventContentStub.java
@@ -10,7 +10,11 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.stubs.event;
+
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
/**
* <b><u>TmfEventContentStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java
index cdb05eec32..1cfda3d031 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java
@@ -10,7 +10,9 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.stubs.event;
+
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
/**
* <b><u>TmfEventTypeStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfSyntheticEventStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfSyntheticEventStub.java
index 7254f35fc3..675c9f7af3 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfSyntheticEventStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfSyntheticEventStub.java
@@ -10,7 +10,9 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.stubs.event;
+
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
/**
* <b><u>TmfSyntheticEventStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfDataRequestStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfDataRequestStub.java
index bdf585f760..36135c5fb0 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfDataRequestStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfDataRequestStub.java
@@ -10,9 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.request;
+package org.eclipse.linuxtools.tmf.stubs.request;
-import org.eclipse.linuxtools.tmf.event.TmfData;
+import org.eclipse.linuxtools.tmf.core.event.TmfData;
+import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
/**
* <b><u>TmfDataRequestStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfEventRequestStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfEventRequestStub.java
index 73991de92e..a88ba4d7b6 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfEventRequestStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfEventRequestStub.java
@@ -10,10 +10,11 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.request;
+package org.eclipse.linuxtools.tmf.stubs.request;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
/**
* <b><u>TmfEventRequestStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java
index eab0891473..ac9d95bbcc 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java
@@ -10,20 +10,23 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.trace;
+package org.eclipse.linuxtools.tmf.stubs.trace;
import java.io.EOFException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.Vector;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEventContent;
-import org.eclipse.linuxtools.tmf.event.TmfEventReference;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.event.TmfEventType;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.parser.ITmfEventParser;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventReference;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
/**
* <b><u>TmfEventParserStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java
index e2cdcbc044..9a87af97a2 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java
@@ -10,17 +10,23 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.trace;
+package org.eclipse.linuxtools.tmf.stubs.trace;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.concurrent.locks.ReentrantLock;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.parser.ITmfEventParser;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
/**
* <b><u>TmfTraceStub</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/test.xml b/lttng/org.eclipse.linuxtools.tmf.core.tests/test.xml
index d654941666..d654941666 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/test.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/test.xml
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/A-Test-10K b/lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/A-Test-10K
index cfb674ae46..cfb674ae46 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/A-Test-10K
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/A-Test-10K
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/E-Test-10K b/lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/E-Test-10K
index 08ab10d40b..08ab10d40b 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/E-Test-10K
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/E-Test-10K
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/O-Test-10K b/lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/O-Test-10K
index c7db621e85..c7db621e85 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/O-Test-10K
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/O-Test-10K
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/R-Test-10K b/lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/R-Test-10K
index 3e1dcb799d..3e1dcb799d 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/testfiles/R-Test-10K
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/testfiles/R-Test-10K
Binary files differ
diff --git a/lttng/org.eclipse.linuxtools.tmf/.classpath b/lttng/org.eclipse.linuxtools.tmf.core/.classpath
index 1fa3e6803d..1fa3e6803d 100644
--- a/lttng/org.eclipse.linuxtools.tmf/.classpath
+++ b/lttng/org.eclipse.linuxtools.tmf.core/.classpath
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/.gitignore b/lttng/org.eclipse.linuxtools.tmf.core/.gitignore
index 8d94ef8deb..8d94ef8deb 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/.gitignore
+++ b/lttng/org.eclipse.linuxtools.tmf.core/.gitignore
diff --git a/lttng/org.eclipse.linuxtools.tmf/.options b/lttng/org.eclipse.linuxtools.tmf.core/.options
index dcc5d6bca4..dcc5d6bca4 100644
--- a/lttng/org.eclipse.linuxtools.tmf/.options
+++ b/lttng/org.eclipse.linuxtools.tmf.core/.options
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/.project b/lttng/org.eclipse.linuxtools.tmf.core/.project
new file mode 100644
index 0000000000..cd66d8b0f4
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.core/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.linuxtools.tmf.core</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/lttng/org.eclipse.linuxtools.tmf/.settings/org.eclipse.jdt.core.prefs b/lttng/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.jdt.core.prefs
index 6b89d83df1..6b89d83df1 100644
--- a/lttng/org.eclipse.linuxtools.tmf/.settings/org.eclipse.jdt.core.prefs
+++ b/lttng/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/ChangeLog b/lttng/org.eclipse.linuxtools.tmf.core/ChangeLog
new file mode 100644
index 0000000000..2ad58a7fcf
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.core/ChangeLog
@@ -0,0 +1,204 @@
+2011-03-10 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/.options: Fixed a typo
+ * src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java: Improved request tracing
+ * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java: Improved request tracing
+ * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: Streamlined constructor
+ * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Improved request tracing
+ * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java: Improved request tracing
+ * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Improved request tracing
+ * src/org/eclipse/linuxtools/tmf/Tracer.java: Improved request tracing
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Fixed request completion call
+
+2010-12-13 Bernd Hufmann <bhufmann@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (armRequest): For data requests, seek only if necessary
+
+2010-11-23 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Adjusted background request block size
+ * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java: Adjusted buffering between checkpoints
+
+2010-11-10 Francois Chouinard <fchouinard@gmail.com>
+
+ Suppress warning for non-externalized strings
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java:
+
+2010-11-09 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (getNextEvent): Fix for NullPointerException
+
+ Suppress warning for non-externalized strings
+ * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java (newCoalescedDataRequest):
+ (coalesceDataRequest):
+ (.run):
+ (queueRequest):
+ * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java (newCoalescedDataRequest):
+ * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java (toString):
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java (toString):
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventField.java (toString):
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java (toString):
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java (toString):
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventType.java (DEFAULT_TYPE_ID):
+ (getLabel):
+ (toString):
+ * src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java (toString):
+ * src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java (synchronize):
+ (toString):
+ * src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java (toString):
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (TmfExperiment):
+ (toString):
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java (toString):
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java (toString):
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java (toString):
+ * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java (TmfDataRequest):
+ (handleCompleted):
+ (start):
+ (done):
+ (toString):
+ * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java (toString):
+ * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java (TmfRequestExecutor):
+ (stop):
+ (.run):
+ (toString):
+ * src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java (toString):
+ * src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java (toString):
+ * src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java (traceSignal):
+ * src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java (toString):
+ * src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java (toString):
+ * src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java (toString):
+ * src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java (toString):
+ * src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java (toString):
+ * src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java (toString):
+ * src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java (PLUGIN_ID):
+ * src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java (toString):
+ * src/org/eclipse/linuxtools/tmf/trace/TmfContext.java (toString):
+ * src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java (toString):
+ (clone):
+ * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (toString):
+ * src/org/eclipse/linuxtools/tmf/Tracer.java:
+
+2010-11-04 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Use the correct index page size
+ * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java: Added indexTrace() and support code
+
+2010-10-29 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (getNextEvent): Removed an unnecessary clone() operation
+
+2010-10-27 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java: Augmented API for coalescing (notifyPendingRequest)
+ * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Request coalescing and cancelling
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Augmented API
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: Improved coalescing and cancelling
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Ditto
+ * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Ditto
+ * src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java: Renaming of a field
+
+2010-10-15 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java: Implement cloning
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java: Implement cloning
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventField.java: Implement cloning
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java: Implement cloning
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java: Implement cloning
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventType.java: Implement cloning
+ * src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java: Implement cloning
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (updateIndex): Fixed timestamp cloning
+ * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Replaced lock.wait() by CountDownLatch
+ * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (updateIndex): Fixed timestamp cloning
+
+2010-10-13 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java: Added checks for disposed widget
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Added checks for disposed widget
+ * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Added waitForStart() API
+ * src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java: Added setEvent()
+ * src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java: Added getIntersection()
+ * src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java: Improved timestamp comparison
+
+2010-09-17 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java: Support for single event
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: Adjusted to new handleData() API
+
+2010-09-17 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java: Support for single event
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Adjusted to new handleData() API
+ * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: Adjusted to new handleData() API
+
+2010-09-15 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Optimized TmfExperimentContext handling
+ * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java: ExecutionType update
+ * src/org/eclipse/linuxtools/tmf/trace/TmfContext.java: ExecutionType update
+ * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java: ExecutionType update
+ * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: ExecutionType update
+ * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: ExecutionType update
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: ExecutionType update
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: ExecutionType update
+ * src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java: ExecutionType update
+ * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: ExecutionType update
+ * src/org/eclipse/linuxtools/tmf/Tracer.java: ExecutionType update
+
+2010-09-09 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Fix in handleData()
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Made class extendable
+
+2010-07-20 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java:
+ - Use a specific lock object (instead of this) for synchronization
+ - Fix executor exception when request comes in immediately after dispose
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java:
+ - Fix constructor ignoring index page size
+ - Update saved context on parse to avoid unnecessary seeks
+
+2010-07-19 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Some modifications to make the experiment more generic.
+
+2010-07-13 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (.updateExperiment): Added check for empty experiment
+ * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (.updateTraceData): Added check for empty trace
+
+2010-07-12 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java: New file.
+ * src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java: New file.
+ * src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java: New file.
+ * src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java: New file.
+ * META-INF/MANIFEST.MF: Added a dependency on org.eclipse.core.resources
+ * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (seekEvent): Commented out useless statements
+ * src/org/eclipse/linuxtools/tmf/trace/ITmfContext.java: Added a constant
+ * src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java: Added APIs
+ * src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java: Added validation on location
+ * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (getRank): Added
+ (indexTrace): Cleaned up warning
+ (queueLongRequest): Added background process handling
+
+2010-07-08 Francois Chouinard <fchouinard@gmail.com>
+
+ * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (indexTrace): New method + renamed a constant
+
+2009-06-16 Andrew Overholt <overholt@redhat.com>
+
+ * META-INF/MANIFEST.MF: Change provider from Ericsson to Eclipse. \ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..185642d259
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.linuxtools.tmf.core;singleton:=true
+Bundle-Version: 0.4.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.tmf.core.TmfCorePlugin
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.100"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.linuxtools.tmf.core,
+ org.eclipse.linuxtools.tmf.core.component,
+ org.eclipse.linuxtools.tmf.core.event,
+ org.eclipse.linuxtools.tmf.core.experiment,
+ org.eclipse.linuxtools.tmf.core.filter,
+ org.eclipse.linuxtools.tmf.core.filter.model,
+ org.eclipse.linuxtools.tmf.core.filter.xml,
+ org.eclipse.linuxtools.tmf.core.io,
+ org.eclipse.linuxtools.tmf.core.parser,
+ org.eclipse.linuxtools.tmf.core.request,
+ org.eclipse.linuxtools.tmf.core.signal,
+ org.eclipse.linuxtools.tmf.core.trace,
+ org.eclipse.linuxtools.tmf.core.uml2sd,
+ org.eclipse.linuxtools.tmf.core.util
+Bundle-Localization: plugin
+Import-Package: org.eclipse.core.filesystem.provider
diff --git a/lttng/org.eclipse.linuxtools.tmf/about.html b/lttng/org.eclipse.linuxtools.tmf.core/about.html
index c258ef55d8..c258ef55d8 100644
--- a/lttng/org.eclipse.linuxtools.tmf/about.html
+++ b/lttng/org.eclipse.linuxtools.tmf.core/about.html
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/build.properties b/lttng/org.eclipse.linuxtools.tmf.core/build.properties
new file mode 100644
index 0000000000..00e586480b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.core/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ plugin.xml,\
+ plugin.properties,\
+ about.html,\
+ .
+ \ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf/plugin.properties b/lttng/org.eclipse.linuxtools.tmf.core/plugin.properties
index d1662a825a..d1662a825a 100644
--- a/lttng/org.eclipse.linuxtools.tmf/plugin.properties
+++ b/lttng/org.eclipse.linuxtools.tmf.core/plugin.properties
diff --git a/lttng/org.eclipse.linuxtools.tmf/plugin.xml b/lttng/org.eclipse.linuxtools.tmf.core/plugin.xml
index f4c52fd5d4..f4c52fd5d4 100644
--- a/lttng/org.eclipse.linuxtools.tmf/plugin.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.core/plugin.xml
diff --git a/lttng/org.eclipse.linuxtools.tmf-feature/pom.xml b/lttng/org.eclipse.linuxtools.tmf.core/pom.xml
index fea4e7cd0a..b8fcf4084f 100644
--- a/lttng/org.eclipse.linuxtools.tmf-feature/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.core/pom.xml
@@ -17,11 +17,29 @@
<version>0.10.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.linuxtools.tmf</artifactId>
+ <artifactId>org.eclipse.linuxtools.tmf.core</artifactId>
<version>0.4.0-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
+ <packaging>eclipse-plugin</packaging>
- <name>Linux Tools LTTng TMF (Tracing and Monitoring Framework)</name>
+ <name>Linux Tools LTTng TMF Core Plug-in</name>
- <groupId>org.eclipse.linuxtools.tmf</groupId>
+ <build>
+ <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <groupId>org.eclipse.linuxtools.tmf</groupId>
</project>
diff --git a/lttng/org.eclipse.linuxtools.tmf/schema/org.eclipse.linuxtools.tmf.tracetype.exsd b/lttng/org.eclipse.linuxtools.tmf.core/schema/org.eclipse.linuxtools.tmf.tracetype.exsd
index 36d8429196..36d8429196 100644
--- a/lttng/org.eclipse.linuxtools.tmf/schema/org.eclipse.linuxtools.tmf.tracetype.exsd
+++ b/lttng/org.eclipse.linuxtools.tmf.core/schema/org.eclipse.linuxtools.tmf.tracetype.exsd
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfCorePlugin.java
index 949ac5b330..239b427776 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfCorePlugin.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf;
+package org.eclipse.linuxtools.tmf.core;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfProjectNature.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java
index d219c1af2c..6d7c6e9ca9 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfProjectNature.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf;
+package org.eclipse.linuxtools.tmf.core;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectNature;
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java
index bf86f2f28f..4881c79f0e 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java
@@ -1,16 +1,16 @@
-package org.eclipse.linuxtools.tmf;
+package org.eclipse.linuxtools.tmf.core;
import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.IOException;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.linuxtools.tmf.component.ITmfComponent;
-import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;
-import org.eclipse.linuxtools.tmf.event.TmfData;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.ITmfEventRequest;
-import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+import org.eclipse.linuxtools.tmf.core.component.ITmfComponent;
+import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;
+import org.eclipse.linuxtools.tmf.core.event.TmfData;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignal;
@SuppressWarnings("nls")
public class Tracer {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfComponent.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfComponent.java
index b82ad6d7a8..e9040500ad 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfComponent.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfComponent.java
@@ -10,9 +10,9 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.component;
+package org.eclipse.linuxtools.tmf.core.component;
-import org.eclipse.linuxtools.tmf.signal.TmfSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignal;
/**
* <b><u>ITmfComponent</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java
index ab88ab578c..d0b3063560 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.component;
+package org.eclipse.linuxtools.tmf.core.component;
-import org.eclipse.linuxtools.tmf.event.TmfData;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.event.TmfData;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
/**
* <b><u>ITmfDataRequest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfComponent.java
index 62d863fc70..58501a4195 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfComponent.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.component;
+package org.eclipse.linuxtools.tmf.core.component;
-import org.eclipse.linuxtools.tmf.signal.TmfSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager;
/**
* <b><u>TmfComponent</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java
index 4d476e93f5..832ffbb4d2 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java
@@ -10,24 +10,24 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.component;
+package org.eclipse.linuxtools.tmf.core.component;
import java.util.Vector;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.SynchronousQueue;
-import org.eclipse.linuxtools.tmf.Tracer;
-import org.eclipse.linuxtools.tmf.event.TmfData;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;
-import org.eclipse.linuxtools.tmf.request.TmfCoalescedDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfRequestExecutor;
-import org.eclipse.linuxtools.tmf.signal.TmfEndSynchSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.signal.TmfStartSynchSignal;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.core.Tracer;
+import org.eclipse.linuxtools.tmf.core.event.TmfData;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
+import org.eclipse.linuxtools.tmf.core.signal.TmfEndSynchSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.signal.TmfStartSynchSignal;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
/**
* <b><u>TmfProvider</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java
index 37e8676d1b..1d738043e8 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java
@@ -10,16 +10,16 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.component;
-
-import org.eclipse.linuxtools.tmf.Tracer;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;
-import org.eclipse.linuxtools.tmf.request.ITmfEventRequest;
-import org.eclipse.linuxtools.tmf.request.TmfCoalescedEventRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
+package org.eclipse.linuxtools.tmf.core.component;
+
+import org.eclipse.linuxtools.tmf.core.Tracer;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedEventRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
/**
* <b><u>TmfEventProvider</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfProviderManager.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfProviderManager.java
index 0b71a53a36..7c9c28596c 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfProviderManager.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfProviderManager.java
@@ -10,14 +10,14 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.component;
+package org.eclipse.linuxtools.tmf.core.component;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.linuxtools.tmf.event.TmfData;
+import org.eclipse.linuxtools.tmf.core.event.TmfData;
/**
* <b><u>TmfProviderManager.java</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfThread.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfThread.java
index 3ee41b7507..921b556160 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfThread.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfThread.java
@@ -1,6 +1,6 @@
-package org.eclipse.linuxtools.tmf.component;
+package org.eclipse.linuxtools.tmf.core.component;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
public class TmfThread extends Thread { // implements Comparator<ITmfDataRequest<?>> {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfData.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfData.java
index 1576c01170..709d771e8a 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfData.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfData.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
/**
* <b><u>TmfData</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java
index be395743de..7b89b4581e 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java
@@ -10,9 +10,9 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
/**
* <b><u>TmfEvent</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventContent.java
index bd9f701e31..7ea4d307d9 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventContent.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
/**
* <b><u>TmfEventContent</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java
index 6729b776ec..b85fb24d56 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
/**
* <b><u>TmfEventField</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventReference.java
index d7a9319552..c5dc9177d6 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventReference.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
/**
* <b><u>TmfEventReference</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventSource.java
index eda1c77f0a..87a2171072 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventSource.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
/**
* <b><u>TmfEventSource</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
index 03f8030795..2ff674b486 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
import java.util.HashMap;
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfNoSuchFieldException.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfNoSuchFieldException.java
index e28e933eaa..b7420a6297 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfNoSuchFieldException.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfNoSuchFieldException.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
/**
* <b><u>TmfNoSuchFieldException</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java
index ae1a67064e..544d56422a 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
/**
* <b><u>TmfTimeRange</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java
index 0708e27721..4ecf90369e 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java
@@ -11,7 +11,7 @@
* Thomas Gatterweh - Updated scaling / synchronization
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
/**
* <b><u>TmfTimestamp</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTraceEvent.java
index 25c05d1bd1..065c673f42 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTraceEvent.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.event;
+package org.eclipse.linuxtools.tmf.core.event;
/**
* <b><u>TmfTraceEvent</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
index 82fcf996fa..0def3397e0 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.experiment;
+package org.eclipse.linuxtools.tmf.core.experiment;
import java.io.FileNotFoundException;
import java.util.Collections;
@@ -21,26 +21,26 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.linuxtools.tmf.component.TmfEventProvider;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.ITmfEventRequest;
-import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
-import org.eclipse.linuxtools.tmf.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentDisposedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfExperimentUpdatedSignal;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
-import org.eclipse.linuxtools.tmf.signal.TmfTraceUpdatedSignal;
-import org.eclipse.linuxtools.tmf.trace.ITmfContext;
-import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
+import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager;
+import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/**
* <b><u>TmfExperiment</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentCheckpoint.java
index d7257f6833..c3d8d1e57d 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentCheckpoint.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.experiment;
+package org.eclipse.linuxtools.tmf.core.experiment;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/**
* <b><u>TmfExperimentCheckpoint</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java
index 3d4981cbc1..72b22b13a3 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java
@@ -10,12 +10,12 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.experiment;
+package org.eclipse.linuxtools.tmf.core.experiment;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/**
* <b><u>TmfExperimentContext</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentLocation.java
index 2637fbe22c..1e901b5426 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentLocation.java
@@ -10,9 +10,9 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.experiment;
+package org.eclipse.linuxtools.tmf.core.experiment;
-import org.eclipse.linuxtools.tmf.trace.TmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
/**
* <b><u>TmfExperimentLocation</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfLocationArray.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLocationArray.java
index e5f7d70820..3210d976b2 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfLocationArray.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLocationArray.java
@@ -10,9 +10,9 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.experiment;
+package org.eclipse.linuxtools.tmf.core.experiment;
-import org.eclipse.linuxtools.tmf.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
public class TmfLocationArray implements Comparable<TmfLocationArray>, Cloneable {
public ITmfLocation<? extends Comparable<?>>[] locations;
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/ITmfFilter.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/ITmfFilter.java
index 02fa8d42e2..1c01af8d5c 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/ITmfFilter.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/ITmfFilter.java
@@ -10,9 +10,9 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter;
+package org.eclipse.linuxtools.tmf.core.filter;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
public interface ITmfFilter {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/ITmfFilterTreeNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/ITmfFilterTreeNode.java
index d77ffff6f3..f3fe069f88 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/ITmfFilterTreeNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/ITmfFilterTreeNode.java
@@ -11,11 +11,11 @@
* Yuriy Vashchuk (yvashchuk@gmail.com) - Initial implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
import java.util.List;
-import org.eclipse.linuxtools.tmf.filter.ITmfFilter;
+import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter;
/**
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterAndNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterAndNode.java
index 673a373465..549c54e9bf 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterAndNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterAndNode.java
@@ -10,9 +10,9 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
public class TmfFilterAndNode extends TmfFilterTreeNode {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterCompareNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterCompareNode.java
index d1f9adc68d..fb9bb56c18 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterCompareNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterCompareNode.java
@@ -10,16 +10,16 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
import java.text.NumberFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
public class TmfFilterCompareNode extends TmfFilterTreeNode {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterContainsNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterContainsNode.java
index e2db82df88..01a7c0429f 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterContainsNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterContainsNode.java
@@ -10,13 +10,13 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException;
public class TmfFilterContainsNode extends TmfFilterTreeNode {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEqualsNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEqualsNode.java
index 16b8aa3696..d7781b5dab 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEqualsNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEqualsNode.java
@@ -10,13 +10,13 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException;
public class TmfFilterEqualsNode extends TmfFilterTreeNode {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEventTypeNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEventTypeNode.java
index 66ea2571e1..8175ad3df8 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEventTypeNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEventTypeNode.java
@@ -10,12 +10,12 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
public class TmfFilterEventTypeNode extends TmfFilterTreeNode {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterMatchesNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterMatchesNode.java
index c0b09cdf95..828de83989 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterMatchesNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterMatchesNode.java
@@ -10,15 +10,15 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException;
public class TmfFilterMatchesNode extends TmfFilterTreeNode {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterNode.java
index 63467419d1..0ed8af5e88 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterNode.java
@@ -10,12 +10,12 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
public class TmfFilterNode extends TmfFilterTreeNode {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterOrNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterOrNode.java
index 185508ee08..c81a6f3d9e 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterOrNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterOrNode.java
@@ -10,9 +10,9 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
public class TmfFilterOrNode extends TmfFilterTreeNode {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterRootNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterRootNode.java
index d31260f5c4..5a48144dd7 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterRootNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterRootNode.java
@@ -10,12 +10,12 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
public class TmfFilterRootNode extends TmfFilterTreeNode {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterTreeNode.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterTreeNode.java
index 88a2607955..cd260f4598 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterTreeNode.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterTreeNode.java
@@ -11,13 +11,13 @@
* Patrick Tasse - Refactoring
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.model;
+package org.eclipse.linuxtools.tmf.core.filter.model;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
/**
* <b><u>TmfFilterTreeNode</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterContentHandler.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterContentHandler.java
index c405f72b9e..f3ecc79d4a 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterContentHandler.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterContentHandler.java
@@ -12,22 +12,22 @@
* Patrick Tasse - Refactoring
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.xml;
+package org.eclipse.linuxtools.tmf.core.filter.xml;
import java.util.Stack;
-import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterAndNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode.Type;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterContainsNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEqualsNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEventTypeNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterMatchesNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterOrNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterRootNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterTreeNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterAndNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterCompareNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterContainsNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEqualsNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEventTypeNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterMatchesNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterOrNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterRootNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterTreeNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterCompareNode.Type;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLParser.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLParser.java
index f58ed8ccec..b56a5d235e 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLParser.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLParser.java
@@ -10,14 +10,14 @@
* Yuriy Vashchuk (yvashchuk@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.xml;
+package org.eclipse.linuxtools.tmf.core.filter.xml;
import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
-import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLWriter.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLWriter.java
index ffd5585875..3e542498d3 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLWriter.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLWriter.java
@@ -10,7 +10,7 @@
* Yuriy Vashchuk (yvashchuk@gmail.com) - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.filter.xml;
+package org.eclipse.linuxtools.tmf.core.filter.xml;
import java.io.File;
import java.io.IOException;
@@ -25,15 +25,15 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterAndNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterContainsNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEqualsNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEventTypeNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterMatchesNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode;
-import org.eclipse.linuxtools.tmf.filter.model.TmfFilterOrNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterAndNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterCompareNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterContainsNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEqualsNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEventTypeNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterMatchesNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterNode;
+import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterOrNode;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/io/BufferedRandomAccessFile.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/io/BufferedRandomAccessFile.java
index 435952fc12..c2980d2c20 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/io/BufferedRandomAccessFile.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/io/BufferedRandomAccessFile.java
@@ -11,7 +11,7 @@
* (http://www.javaworld.com/javatips/jw-javatip26.html)
******************************************************************************/
-package org.eclipse.linuxtools.tmf.io;
+package org.eclipse.linuxtools.tmf.core.io;
import java.io.File;
import java.io.IOException;
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/parser/ITmfEventParser.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parser/ITmfEventParser.java
index bf5f34d341..910db144c4 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/parser/ITmfEventParser.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parser/ITmfEventParser.java
@@ -10,13 +10,13 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.parser;
+package org.eclipse.linuxtools.tmf.core.parser;
import java.io.IOException;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.trace.TmfContext;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
+import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
/**
* <b><u>ITmfEventParser</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java
index 9e3760f74e..feec21c7a4 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java
@@ -10,9 +10,9 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.request;
+package org.eclipse.linuxtools.tmf.core.request;
-import org.eclipse.linuxtools.tmf.event.TmfData;
+import org.eclipse.linuxtools.tmf.core.event.TmfData;
/**
* <b><u>ITmfDataRequest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfEventRequest.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java
index 9e28b287d7..9014380c02 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfEventRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.request;
+package org.eclipse.linuxtools.tmf.core.request;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
/**
* <b><u>ITmfEventRequest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedDataRequest.java
index 738e8f1b67..fc923b5036 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedDataRequest.java
@@ -10,11 +10,11 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.request;
+package org.eclipse.linuxtools.tmf.core.request;
import java.util.Vector;
-import org.eclipse.linuxtools.tmf.event.TmfData;
+import org.eclipse.linuxtools.tmf.core.event.TmfData;
/**
* <b><u>TmfCoalescedDataRequest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java
index efbb88a03d..13327067bd 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java
@@ -10,11 +10,11 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.request;
+package org.eclipse.linuxtools.tmf.core.request;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
/**
* <b><u>TmfCoalescedEventRequest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java
index d4329bdaa4..9f06934a5b 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java
@@ -10,12 +10,12 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.request;
+package org.eclipse.linuxtools.tmf.core.request;
import java.util.concurrent.CountDownLatch;
-import org.eclipse.linuxtools.tmf.Tracer;
-import org.eclipse.linuxtools.tmf.event.TmfData;
+import org.eclipse.linuxtools.tmf.core.Tracer;
+import org.eclipse.linuxtools.tmf.core.event.TmfData;
/**
* <b><u>TmfDataRequest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java
index f5375a3bf8..e34f39b52e 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.request;
+package org.eclipse.linuxtools.tmf.core.request;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
/**
* <b><u>TmfEventRequest</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfRequestExecutor.java
index 56f967b2ec..ef406dc9c8 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfRequestExecutor.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.request;
+package org.eclipse.linuxtools.tmf.core.request;
import java.util.Comparator;
import java.util.concurrent.Executor;
@@ -18,9 +18,9 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.PriorityBlockingQueue;
-import org.eclipse.linuxtools.tmf.Tracer;
-import org.eclipse.linuxtools.tmf.component.TmfThread;
-import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;
+import org.eclipse.linuxtools.tmf.core.Tracer;
+import org.eclipse.linuxtools.tmf.core.component.TmfThread;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
/**
* <b><u>TmfRequestExecutor</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfEndSynchSignal.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfEndSynchSignal.java
index caeaff17e7..e824e8356e 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfEndSynchSignal.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfEndSynchSignal.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.signal;
+package org.eclipse.linuxtools.tmf.core.signal;
/**
* <b><u>TmfEndSynchSignal</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentDisposedSignal.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java
index 33bfe55c4e..efa66b3399 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentDisposedSignal.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.signal;
+package org.eclipse.linuxtools.tmf.core.signal;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
/**
* <b><u>TmfExperimentDisposedSignal</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentRangeUpdatedSignal.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java
index 80a94ad238..cb08b29d77 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentRangeUpdatedSignal.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java
@@ -10,11 +10,11 @@
* Patrick Tasse - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.signal;
+package org.eclipse.linuxtools.tmf.core.signal;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
/**
* <b><u>TmfExperimentRangeUpdatedSignal</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java
index 9aa264fd68..a476d768b7 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.signal;
+package org.eclipse.linuxtools.tmf.core.signal;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
/**
* <b><u>TmfExperimentSelectedSignal</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java
index f217f4c57f..738a88ff19 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.signal;
+package org.eclipse.linuxtools.tmf.core.signal;
-import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.experiment.TmfExperiment;
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment;
/**
* <b><u>TmfExperimentUpdatedSignal</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfRangeSynchSignal.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfRangeSynchSignal.java
index b73b0d7fce..1892b3cb3c 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfRangeSynchSignal.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfRangeSynchSignal.java
@@ -10,10 +10,10 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.signal;
+package org.eclipse.linuxtools.tmf.core.signal;
-import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
/**
* <b><u>TmfRangeSynchSignal</u></b>
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignal.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignal.java
index 340bfc179e..ebf321096a 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignal.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignal.java
@@ -10,7 +10,7 @@
* Francois Chouinard - Initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.tmf.signal;
+package org.eclipse.linuxtools.tmf.core.signal;