projects / deliverable / tracecompass.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 890f913 9c0ffa3)
Merge branch 'master' into lttng-luna
authorAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Fri, 5 Jul 2013 22:32:21 +0000 (18:32 -0400)
committerAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Fri, 5 Jul 2013 22:41:31 +0000 (18:41 -0400)
Conflicts:
lttng/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java
lttng/org.eclipse.linuxtools.ctf/feature.xml
lttng/org.eclipse.linuxtools.gdbtrace/feature.xml
lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.lttng2.kernel/feature.xml
lttng/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.lttng2/feature.xml
lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.tmf/feature.xml

Change-Id: Ia2f059338062068ca4d5b7cc25d6b2ac447ebba3

27 files changed:
1  2 
org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.ctf/feature.xml patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.gdbtrace.core.tests/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.gdbtrace.help/pom.xml patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.gdbtrace.ui.tests/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.gdbtrace/feature.xml patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng.help/pom.xml patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng.releng-site/pom.xml patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng2.kernel/feature.xml patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.lttng2/feature.xml patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.help/pom.xml patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf/feature.xml patch | diff1 | diff2 | blob | history
pom.xml patch | diff1 | diff2 | blob | history

diff --cc org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
index e95a4b62285f0e781dacd5d7568f361eac3ecb6f,aa59f38f4857ec811ae11943c7abda6a52578fe7..221d58ac60991881883584dc8dd6398ef3584392
--- 1/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
@@@ -10,6 -10,7 +10,7 @@@ Bundle-ActivationPolicy: laz
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Require-Bundle: org.junit;bundle-version="4.0.0",
   org.eclipse.core.runtime;bundle-version="3.8.0",
 - org.eclipse.linuxtools.ctf.core;bundle-version="2.1.0"
 + org.eclipse.linuxtools.ctf.core;bundle-version="3.0.0"
- Export-Package: org.eclipse.linuxtools.ctf.core.tests.shared
+ Export-Package: org.eclipse.linuxtools.ctf.core.tests,
+  org.eclipse.linuxtools.ctf.core.tests.shared
  Import-Package: org.antlr.runtime;version="3.2.0"
diff --cc org.eclipse.linuxtools.ctf/feature.xml
index 9aa91972e36c14b30a14ede87cd0d151a1009508,32689464d2f25548b929d0c3de43dc1f09cc4be6..5f5179678a9f5b201ef0bbfaeadda5daf505c6cf
--- 1/org.eclipse.linuxtools.ctf/feature.xml
--- 2/org.eclipse.linuxtools.ctf/feature.xml
+++ b/org.eclipse.linuxtools.ctf/feature.xml
@@@ -2,8 -2,10 +2,10 @@@
  <feature
        id="org.eclipse.linuxtools.ctf"
        label="%featureName"
 -      version="2.1.0.qualifier"
 +      version="3.0.0.qualifier"
-       provider-name="%featureProvider">
+       provider-name="%featureProvider"
+       license-feature="org.eclipse.linuxtools.license.feature"
+       license-feature-version="1.0.0.qualifier">
  
     <description url="http://www.example.com/description">
        %description
diff --cc org.eclipse.linuxtools.gdbtrace.core.tests/META-INF/MANIFEST.MF
index 2b10296ef02993ad61d6aa6f61621126b76ab79b,bd614b0f423980f1dd10ca8289a47ea72c1d88ee..1fb7a378d5e8701ec7e35ad4b38dcd7cc65d83bd
--- 1/org.eclipse.linuxtools.gdbtrace.core.tests/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.gdbtrace.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.gdbtrace.core.tests/META-INF/MANIFEST.MF
@@@ -2,10 -2,12 +2,12 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: %Bundle-Name
  Bundle-Vendor: %Bundle-Vendor
 -Bundle-Version: 2.1.0.qualifier
 +Bundle-Version: 3.0.0.qualifier
  Bundle-Localization: plugin
- Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.core.tests
+ Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.core.tests;singleton:=true
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Fragment-Host: org.eclipse.linuxtools.gdbtrace.core
- Require-Bundle: org.junit;bundle-version="4.0.0"
+ Require-Bundle: org.junit;bundle-version="4.0.0",
+  org.eclipse.core.runtime,
 - org.eclipse.linuxtools.gdbtrace.core;bundle-version="2.1.0"
++ org.eclipse.linuxtools.gdbtrace.core;bundle-version="3.0.0"
+ Export-Package: org.eclipse.linuxtools.gdbtrace.core.tests
diff --cc org.eclipse.linuxtools.gdbtrace.ui.tests/META-INF/MANIFEST.MF
index 3dd9e20193de838b81bfd93421c7611446634c64,e97cfce5965d24fc030d11975e3d6244c0da5d8e..8e729ea5f94f7edc59317410d12f5260c1064d47
--- 1/org.eclipse.linuxtools.gdbtrace.ui.tests/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.gdbtrace.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.gdbtrace.ui.tests/META-INF/MANIFEST.MF
@@@ -2,10 -2,13 +2,13 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: %Bundle-Name
  Bundle-Vendor: %Bundle-Vendor
 -Bundle-Version: 2.1.0.qualifier
 +Bundle-Version: 3.0.0.qualifier
  Bundle-Localization: plugin
- Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.ui.tests
+ Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.ui.tests;singleton:=true
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Fragment-Host: org.eclipse.linuxtools.gdbtrace.ui
- Require-Bundle: org.junit;bundle-version="4.0.0"
+ Require-Bundle: org.junit;bundle-version="4.0.0",
+  org.eclipse.core.runtime,
+  org.eclipse.ui,
 - org.eclipse.linuxtools.gdbtrace.ui;bundle-version="2.1.0"
++ org.eclipse.linuxtools.gdbtrace.ui;bundle-version="3.0.0"
+ Export-Package: org.eclipse.linuxtools.gdbtrace.ui.tests
diff --cc org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
index 4a8d6ccca2269771b6beb4e43a1bcf97afdd556d,27764150db9a0a53a7cdfd19bfd75b0ec247bf89..980bae69d4f22e6a843dcc93dcb5db4558dd28b5
--- 1/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
@@@ -12,12 -12,12 +12,12 @@@ Require-Bundle: org.eclipse.core.runtim
   org.eclipse.ui.console,
   org.eclipse.ui.ide,
   org.eclipse.debug.ui,
 - org.eclipse.linuxtools.tmf.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.tmf.ui;bundle-version="2.1.0",
 - org.eclipse.linuxtools.gdbtrace.core;bundle-version="2.1.0"
 + org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0",
 + org.eclipse.linuxtools.tmf.ui;bundle-version="3.0.0",
 + org.eclipse.linuxtools.gdbtrace.core;bundle-version="3.0.0"
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Export-Package: org.eclipse.linuxtools.internal.gdbtrace.ui;x-internal:=true,
+ Export-Package: org.eclipse.linuxtools.internal.gdbtrace.ui;x-friends:="org.eclipse.linuxtools.gdbtrace.ui.tests",
   org.eclipse.linuxtools.internal.gdbtrace.ui.views;x-internal:=true,
   org.eclipse.linuxtools.internal.gdbtrace.ui.views.events;x-internal:=true,
   org.eclipse.linuxtools.internal.gdbtrace.ui.views.project.dialogs;x-internal:=true,
diff --cc org.eclipse.linuxtools.gdbtrace/feature.xml
index 87cb78f520c84337929a1478c389a5791b4038a6,d3d6c91cad03a84a549c2ce67da5594dbf1d5230..58338f28c2d774f0e7cda6849867b9a91d44dfb2
--- 1/org.eclipse.linuxtools.gdbtrace/feature.xml
--- 2/org.eclipse.linuxtools.gdbtrace/feature.xml
+++ b/org.eclipse.linuxtools.gdbtrace/feature.xml
@@@ -2,8 -2,10 +2,10 @@@
  <feature
        id="org.eclipse.linuxtools.gdbtrace"
        label="%featureName"
 -      version="2.1.0.qualifier"
 +      version="3.0.0.qualifier"
-       provider-name="%featureProvider">
+       provider-name="%featureProvider"
+       license-feature="org.eclipse.linuxtools.license.feature"
+       license-feature-version="1.0.0.qualifier">
  
     <description>
        %description
diff --cc org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
index 59f09411c53c7d4413af742bfcda0a7293ed7e88,b9c2d4a4efcd32e8b105e95bd9f138d429bb8030..db015d99861589bded784b5dbc536beb59999388
--- 1/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
@@@ -2,10 -2,12 +2,12 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: %Bundle-Name
  Bundle-Vendor: %Bundle-Vendor
 -Bundle-Version: 2.1.0.qualifier
 +Bundle-Version: 3.0.0.qualifier
  Bundle-Localization: plugin
- Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core.tests
+ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core.tests;singleton:=true
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Fragment-Host: org.eclipse.linuxtools.lttng2.core
- Require-Bundle: org.junit;bundle-version="4.0.0"
+ Require-Bundle: org.junit;bundle-version="4.0.0",
+  org.eclipse.core.runtime,
 - org.eclipse.linuxtools.lttng2.core;bundle-version="2.1.0"
++ org.eclipse.linuxtools.lttng2.core;bundle-version="3.0.0"
+ Export-Package: org.eclipse.linuxtools.lttng2.core.tests
diff --cc org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
index 6f0114b17d42fb8a0832c45a4d7935f7f3507819,b13ebac3b33dabd71be1a844633057b999eaeb2b..adbf197ddc79b6428357ded88042b574263d8c27
--- 1/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
@@@ -2,12 -2,14 +2,14 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: %Bundle-Name
  Bundle-Vendor: %Bundle-Vendor
 -Bundle-Version: 2.1.0.qualifier
 +Bundle-Version: 3.0.0.qualifier
  Bundle-Localization: plugin
- Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.core.tests
+ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.core.tests;singleton:=true
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Fragment-Host: org.eclipse.linuxtools.lttng2.kernel.core
  Require-Bundle: org.junit;bundle-version="4.0.0",
 - org.eclipse.linuxtools.tmf.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.tmf.core.tests;bundle-version="2.1.0",
 - org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="2.1.0"
+  org.eclipse.core.runtime,
-  org.eclipse.linuxtools.tmf.core.tests;bundle-version="3.0.0"
 + org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0",
++ org.eclipse.linuxtools.tmf.core.tests;bundle-version="3.0.0",
++ org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="3.0.0"
+ Export-Package: org.eclipse.linuxtools.lttng2.kernel.core.tests
diff --cc org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
index 44140b9027b08188be8e49be301c15db0b367649,6e374ae669f2392c6e81ea528dba74788a5bb6d6..7e84ee5353fe81a12ea505e892a6bca9d1bf53b6
--- 1/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
@@@ -10,8 -10,8 +10,8 @@@ Bundle-ActivationPolicy: laz
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Require-Bundle: org.eclipse.core.runtime,
   org.eclipse.core.resources,
 - org.eclipse.linuxtools.ctf.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.tmf.core;bundle-version="2.1.0"
 + org.eclipse.linuxtools.ctf.core;bundle-version="3.0.0",
 + org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0"
- Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.core;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui",
-  org.eclipse.linuxtools.internal.lttng2.kernel.core.stateprovider;x-internal:=true,
+ Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.core;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui,org.eclipse.linuxtools.lttng2.kernel.core.tests",
+  org.eclipse.linuxtools.internal.lttng2.kernel.core.stateprovider;x-friends:="org.eclipse.linuxtools.lttng2.kernel.core.tests",
   org.eclipse.linuxtools.lttng2.kernel.core.trace
diff --cc org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
index f132a921bc553708b57e50c5ae6f53584b0de96b,ff453f810ed2eb56980df1a4221f5c34b5134659..e917574461bf3410e714d6d381fba819744c836f
--- 1/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
@@@ -2,10 -2,13 +2,13 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: %Bundle-Name
  Bundle-Vendor: %Bundle-Vendor
 -Bundle-Version: 2.1.0.qualifier
 +Bundle-Version: 3.0.0.qualifier
  Bundle-Localization: plugin
- Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.ui.tests
+ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.ui.tests;singleton:=true
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Fragment-Host: org.eclipse.linuxtools.lttng2.kernel.ui
- Require-Bundle: org.junit;bundle-version="4.0.0"
+ Require-Bundle: org.junit;bundle-version="4.0.0",
+  org.eclipse.core.runtime,
+  org.eclipse.ui,
 - org.eclipse.linuxtools.lttng2.kernel.ui;bundle-version="2.1.0"
++ org.eclipse.linuxtools.lttng2.kernel.ui;bundle-version="3.0.0"
+ Export-Package: org.eclipse.linuxtools.lttng2.kernel.ui.tests
diff --cc org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
index 7d5fbf9d1de73f968f2278138ec7729086dfefc7,6f157d89f88e3effcaf7f3bed09d2842826a85a2..aa69287ab20f25a32d3ead92007d83373e9f18c6
--- 1/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
@@@ -12,12 -12,12 +12,12 @@@ Require-Bundle: org.eclipse.ui
   org.eclipse.ui.ide,
   org.eclipse.core.resources,
   org.eclipse.core.runtime,
 - org.eclipse.linuxtools.tmf.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.tmf.ui;bundle-version="2.1.0",
 - org.eclipse.linuxtools.lttng2.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.lttng2.ui;bundle-version="2.1.0",
 - org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="2.1.0"
 + org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0",
 + org.eclipse.linuxtools.tmf.ui;bundle-version="3.0.0",
 + org.eclipse.linuxtools.lttng2.core;bundle-version="3.0.0",
 + org.eclipse.linuxtools.lttng2.ui;bundle-version="3.0.0",
 + org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="3.0.0"
- Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.ui;x-internal:=true,
+ Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.ui;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui.tests",
   org.eclipse.linuxtools.internal.lttng2.kernel.ui.viewers.events;x-internal:=true,
   org.eclipse.linuxtools.internal.lttng2.kernel.ui.views;x-internal:=true,
   org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.controlflow;x-internal:=true,
diff --cc org.eclipse.linuxtools.lttng2.kernel/feature.xml
index a7f7a886c50faf4042fca974e881e446dcaafa2e,4190e61b58b34b7d12d8a700f17e60b84a30b678..eaeedba471822d11d4188620b49c724a4acd3f7f
--- 1/org.eclipse.linuxtools.lttng2.kernel/feature.xml
--- 2/org.eclipse.linuxtools.lttng2.kernel/feature.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel/feature.xml
@@@ -3,8 -3,10 +3,10 @@@
  <feature
        id="org.eclipse.linuxtools.lttng2.kernel"
        label="%featureName"
 -      version="2.1.0.qualifier"
 +      version="3.0.0.qualifier"
-       provider-name="%featureProvider">
+       provider-name="%featureProvider"
+       license-feature="org.eclipse.linuxtools.license.feature"
+       license-feature-version="1.0.0.qualifier">
  
     <description>
        %description
diff --cc org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
index d3af4c87d864f91ec7e546efa7cb112779d2e6c7,89931d6a44eec08b6a5ee12066691cf197e6e3b4..3a486057b2c128cde5ea2d06eef5dde659201e6d
--- 1/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
@@@ -2,10 -2,23 +2,23 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: %Bundle-Name
  Bundle-Vendor: %Bundle-Vendor
 -Bundle-Version: 2.1.0.qualifier
 +Bundle-Version: 3.0.0.qualifier
  Bundle-Localization: plugin
- Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui.tests
+ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui.tests;singleton:=true
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Fragment-Host: org.eclipse.linuxtools.lttng2.ui
- Require-Bundle: org.junit;bundle-version="4.0.0"
+ Require-Bundle: org.junit;bundle-version="4.0.0",
+  org.eclipse.core.commands,
+  org.eclipse.core.runtime,
+  org.eclipse.ui,
+  org.eclipse.ui.ide,
 - org.eclipse.linuxtools.lttng2.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.lttng2.ui;bundle-version="2.1.0"
++ org.eclipse.linuxtools.lttng2.core;bundle-version="3.0.0",
++ org.eclipse.linuxtools.lttng2.ui;bundle-version="3.0.0"
+ Import-Package: org.eclipse.rse.core,
+  org.eclipse.rse.core.model,
+  org.eclipse.rse.core.subsystems,
+  org.eclipse.rse.services.shells,
+  org.eclipse.rse.services.terminals,
+  org.eclipse.rse.subsystems.files.core,
+  org.eclipse.rse.subsystems.files.core.servicesubsystem
+ Export-Package: org.eclipse.linuxtools.lttng2.ui.tests
diff --cc org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
index e1416c81edcf6fd2429e069a5a349bd861f83de4,42bc460e392b18c57f13a2d59947c6dba4164eb0..2bba394069ae4552bd15e6cbdef2de1396d8c988
--- 1/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
@@@ -12,21 -12,21 +12,21 @@@ Require-Bundle: org.eclipse.ui
   org.eclipse.ui.ide,
   org.eclipse.core.resources,
   org.eclipse.core.runtime,
 - org.eclipse.linuxtools.lttng2.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.tmf.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.tmf.ui;bundle-version="2.1.0"
 + org.eclipse.linuxtools.lttng2.core;bundle-version="3.0.0",
 + org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0",
 + org.eclipse.linuxtools.tmf.ui;bundle-version="3.0.0"
- Export-Package: org.eclipse.linuxtools.internal.lttng2.ui;x-internal:=true,
-  org.eclipse.linuxtools.internal.lttng2.ui.views.control;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui",
-  org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs;x-internal:=true,
+ Export-Package: org.eclipse.linuxtools.internal.lttng2.ui;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
+  org.eclipse.linuxtools.internal.lttng2.ui.views.control;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui,org.eclipse.linuxtools.lttng2.ui.tests",
+  org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
   org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers;x-internal:=true,
-  org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging;x-internal:=true,
+  org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
   org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages;x-internal:=true,
-  org.eclipse.linuxtools.internal.lttng2.ui.views.control.model;x-internal:=true,
-  org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl;x-internal:=true,
-  org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences;x-internal:=true,
-  org.eclipse.linuxtools.internal.lttng2.ui.views.control.property;x-internal:=true,
-  org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote;x-internal:=true,
-  org.eclipse.linuxtools.internal.lttng2.ui.views.control.service;x-internal:=true
+  org.eclipse.linuxtools.internal.lttng2.ui.views.control.model;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
+  org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
+  org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
+  org.eclipse.linuxtools.internal.lttng2.ui.views.control.property;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
+  org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests",
+  org.eclipse.linuxtools.internal.lttng2.ui.views.control.service;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests"
  Import-Package: org.eclipse.rse.core,
   org.eclipse.rse.core.model,
   org.eclipse.rse.core.subsystems,
diff --cc org.eclipse.linuxtools.lttng2/feature.xml
index bb031a22dd84ff3d647b8e68fa94646bdcc3b9c8,f5282429ccf84c0e116beaedbc7e8c37667d43f5..07ddb7c42dbe024829c4f9a2fa46c5564abf658f
--- 1/org.eclipse.linuxtools.lttng2/feature.xml
--- 2/org.eclipse.linuxtools.lttng2/feature.xml
+++ b/org.eclipse.linuxtools.lttng2/feature.xml
@@@ -2,8 -2,10 +2,10 @@@
  <feature
        id="org.eclipse.linuxtools.lttng2"
        label="%featureName"
 -      version="2.1.0.qualifier"
 +      version="3.0.0.qualifier"
-       provider-name="%featureProvider">
+       provider-name="%featureProvider"
+       license-feature="org.eclipse.linuxtools.license.feature"
+       license-feature-version="1.0.0.qualifier">
  
     <description url="http://www.example.com/description">
        %description
diff --cc org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
index 05d136befe35183d3a64527fe207b19d5716dac9,9ae86ee5b2ca8c752e58e91d9770c62208739c26..9117e0a55af4a8b699d43e3b199112672cca066a
--- 1/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
@@@ -11,8 -11,9 +11,9 @@@ Bundle-RequiredExecutionEnvironment: Ja
  Require-Bundle: org.junit;bundle-version="4.0.0",
   org.eclipse.core.runtime,
   org.eclipse.core.resources,
 - org.eclipse.linuxtools.tmf.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.ctf.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.ctf.core.tests;bundle-version="2.1.0"
 + org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0",
 + org.eclipse.linuxtools.ctf.core;bundle-version="3.0.0",
 + org.eclipse.linuxtools.ctf.core.tests;bundle-version="3.0.0"
- Export-Package: org.eclipse.linuxtools.tmf.core.tests.shared,
+ Export-Package: org.eclipse.linuxtools.tmf.core.tests,
+  org.eclipse.linuxtools.tmf.core.tests.shared,
   org.eclipse.linuxtools.tmf.tests.stubs.trace;x-friends:="org.eclipse.linuxtools.tmf.ui.tests"
diff --cc org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
index 5147cd507cb1f463778bca6e706c939730df4af1,13ac74e379f8a15560895968abd66662303739c7..14860f03565a8ab41cbff9152bd678d77400198b
--- 1/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
@@@ -11,6 -11,7 +11,7 @@@ Require-Bundle: org.junit;bundle-versio
   org.eclipse.ui,
   org.eclipse.core.runtime,
   org.eclipse.core.resources,
 - org.eclipse.linuxtools.tmf.core;bundle-version="2.1.0",
 - org.eclipse.linuxtools.tmf.ui;bundle-version="2.1.0",
 - org.eclipse.linuxtools.tmf.core.tests;bundle-version="2.1.0"
 + org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0",
 + org.eclipse.linuxtools.tmf.ui;bundle-version="3.0.0",
 + org.eclipse.linuxtools.tmf.core.tests;bundle-version="3.0.0"
+ Export-Package: org.eclipse.linuxtools.tmf.ui.tests
diff --cc org.eclipse.linuxtools.tmf/feature.xml
index 60e9c73fb1812d0acdfa111a98335d28a760a8d0,a2a1906c927521e59be038e837c6c579ca693878..65558d484de32021dc10ecf308dd7f27d46333ef
--- 1/org.eclipse.linuxtools.tmf/feature.xml
--- 2/org.eclipse.linuxtools.tmf/feature.xml
+++ b/org.eclipse.linuxtools.tmf/feature.xml
@@@ -2,8 -2,10 +2,10 @@@
  <feature
        id="org.eclipse.linuxtools.tmf"
        label="%featureName"
 -      version="2.1.0.qualifier"
 +      version="3.0.0.qualifier"
-       provider-name="%featureProvider">
+       provider-name="%featureProvider"
+       license-feature="org.eclipse.linuxtools.license.feature"
+       license-feature-version="1.0.0.qualifier">
  
     <description>
        %description
diff --cc pom.xml
Simple merge
Tracecompass - Deliverables
This page took 0.044556 seconds and 5 git commands to generate.