From 59db415b0a32a50c5661e2256127f69a5f0d5cf1 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Tue, 11 Dec 2012 16:31:51 -0500 Subject: [PATCH] tmf: Correctly export all packages in runtime plugins The API tools need the packages to be correctly exported (even the internal ones, they should be explicitely set to "hidden from all plug-ins except: "). This patch enables the project-specific settings to warn for missing exported packages, exports the missing ones, and fixes a missing annotation. Change-Id: Id63e1e6a586eddc66dc3f14e6b58ec6bc3bd9dfe Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/9168 Tested-by: Hudson CI Reviewed-by: Bernd Hufmann IP-Clean: Bernd Hufmann Tested-by: Bernd Hufmann --- .../.settings/org.eclipse.pde.prefs | 32 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 6 +++- .../.settings/org.eclipse.pde.prefs | 32 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 3 +- .../.settings/org.eclipse.pde.prefs | 32 +++++++++++++++++++ .../.settings/org.eclipse.pde.prefs | 32 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 6 ++++ .../.settings/org.eclipse.pde.prefs | 32 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 3 +- .../.settings/org.eclipse.pde.prefs | 32 +++++++++++++++++++ .../.settings/org.eclipse.pde.prefs | 32 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 2 ++ .../tmf/ui/properties/TmfTimePreferences.java | 3 +- 13 files changed, 243 insertions(+), 4 deletions(-) create mode 100644 org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.pde.prefs create mode 100644 org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.pde.prefs create mode 100644 org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.pde.prefs create mode 100644 org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.pde.prefs create mode 100644 org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.pde.prefs create mode 100644 org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.pde.prefs create mode 100644 org.eclipse.linuxtools.tmf.ui/.settings/org.eclipse.pde.prefs diff --git a/org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.pde.prefs new file mode 100644 index 0000000000..dde7d8face --- /dev/null +++ b/org.eclipse.linuxtools.ctf.core/.settings/org.eclipse.pde.prefs @@ -0,0 +1,32 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=1 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=1 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.not-externalized-att=2 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF index 89e84fcd43..3a14d55d34 100644 --- a/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF @@ -13,6 +13,10 @@ Require-Bundle: org.eclipse.core.runtime, Export-Package: org.eclipse.linuxtools.ctf.core.event, org.eclipse.linuxtools.ctf.core.event.types, org.eclipse.linuxtools.ctf.core.trace, - org.eclipse.linuxtools.internal.ctf.core.event.io + org.eclipse.linuxtools.internal.ctf.core;x-internal:=true, + org.eclipse.linuxtools.internal.ctf.core.event.io;x-internal:=true, + org.eclipse.linuxtools.internal.ctf.core.event.metadata;x-internal:=true, + org.eclipse.linuxtools.internal.ctf.core.event.metadata.exceptions;x-internal:=true, + org.eclipse.linuxtools.internal.ctf.core.trace;x-internal:=true Import-Package: org.antlr.runtime;version="3.2.0", org.antlr.runtime.tree;version="3.2.0" diff --git a/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.pde.prefs new file mode 100644 index 0000000000..97b4320800 --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.pde.prefs @@ -0,0 +1,32 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=1 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.not-externalized-att=2 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF index 07f8e444a2..3e26286103 100644 --- a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF @@ -9,5 +9,6 @@ Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.core.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.core.runtime -Export-Package: org.eclipse.linuxtools.internal.lttng2.core.control.model;x-friends:="org.eclipse.linuxtools.lttng2.ui", +Export-Package: org.eclipse.linuxtools.internal.lttng2.core;x-internal:=true, + org.eclipse.linuxtools.internal.lttng2.core.control.model;x-friends:="org.eclipse.linuxtools.lttng2.ui", org.eclipse.linuxtools.internal.lttng2.core.control.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.ui" diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.pde.prefs new file mode 100644 index 0000000000..97b4320800 --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.kernel.core/.settings/org.eclipse.pde.prefs @@ -0,0 +1,32 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=1 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.not-externalized-att=2 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.pde.prefs new file mode 100644 index 0000000000..97b4320800 --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/.settings/org.eclipse.pde.prefs @@ -0,0 +1,32 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=1 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.not-externalized-att=2 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF index 0df94c56b1..0d36e378d8 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF @@ -17,3 +17,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.linuxtools.lttng2.core;bundle-version="2.0.0", org.eclipse.linuxtools.lttng2.ui;bundle-version="2.0.0", org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="2.0.0" +Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.ui;x-internal:=true, + 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.common;x-internal:=true, + org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.controlflow;x-internal:=true, + org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources;x-internal:=true diff --git a/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.pde.prefs new file mode 100644 index 0000000000..97b4320800 --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.pde.prefs @@ -0,0 +1,32 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=1 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.not-externalized-att=2 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF index f0fe2c3e72..17ca22f22b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF @@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.linuxtools.lttng2.core;bundle-version="2.0.0", org.eclipse.linuxtools.tmf.core;bundle-version="2.0.0", org.eclipse.linuxtools.tmf.ui;bundle-version="1.0.0" -Export-Package: org.eclipse.linuxtools.internal.lttng2.ui.views.control;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui", +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, org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers;x-internal:=true, org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging;x-internal:=true, diff --git a/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.pde.prefs new file mode 100644 index 0000000000..97b4320800 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.pde.prefs @@ -0,0 +1,32 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=1 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.not-externalized-att=2 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/org.eclipse.linuxtools.tmf.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.tmf.ui/.settings/org.eclipse.pde.prefs new file mode 100644 index 0000000000..97b4320800 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/.settings/org.eclipse.pde.prefs @@ -0,0 +1,32 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=1 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.not-externalized-att=2 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF index 02a3c6342c..9b51a98d4d 100644 --- a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF @@ -23,10 +23,12 @@ Export-Package: org.eclipse.linuxtools.internal.tmf.ui;x-friends:="org.eclipse.l org.eclipse.linuxtools.internal.tmf.ui.parsers.custom;x-internal:=true, org.eclipse.linuxtools.internal.tmf.ui.parsers.wizards;x-internal:=true, org.eclipse.linuxtools.internal.tmf.ui.preferences;x-internal:=true, + org.eclipse.linuxtools.internal.tmf.ui.project.dialogs;x-internal:=true, org.eclipse.linuxtools.internal.tmf.ui.project.handlers;x-internal:=true, org.eclipse.linuxtools.tmf.ui.editors, org.eclipse.linuxtools.tmf.ui.project.model, org.eclipse.linuxtools.tmf.ui.project.wizards, + org.eclipse.linuxtools.tmf.ui.properties, org.eclipse.linuxtools.tmf.ui.viewers, org.eclipse.linuxtools.tmf.ui.viewers.events, org.eclipse.linuxtools.tmf.ui.viewers.statistics, diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimePreferences.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimePreferences.java index 4cbe4b6581..c4371cc3d3 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimePreferences.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimePreferences.java @@ -19,8 +19,9 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestampFormat; /** * TMF Time format preferences * - * @version 1.0 * @author Francois Chouinard + * @version 1.0 + * @since 2.0 */ @SuppressWarnings("javadoc") public class TmfTimePreferences { -- 2.34.1