From e82920ca1ffdf822aedf5cdadf11eee5659ac9ea Mon Sep 17 00:00:00 2001 From: Pascal Rapicault Date: Thu, 2 Apr 2009 14:25:29 +0000 Subject: HEAD - Enable api tooling + adjust import packages and EE --- bundles/org.eclipse.equinox.p2.directorywatcher/.project | 6 ++++++ .../org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.equinox.p2.repository.tools/.project | 6 ++++++ .../org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.equinox.p2.repository/.project | 6 ++++++ bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF | 6 +++++- bundles/org.eclipse.equinox.p2.ui/.project | 6 ++++++ bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF | 6 ++++-- .../equinox/internal/provisional/p2/ui/IProvHelpContextIds.java | 2 ++ .../eclipse/equinox/internal/provisional/p2/ui/IStatusCodes.java | 1 + .../eclipse/equinox/internal/provisional/p2/ui/ProvUIImages.java | 2 ++ .../equinox/internal/provisional/p2/ui/viewers/IUDragAdapter.java | 2 +- bundles/org.eclipse.equinox.p2.updatechecker/.project | 6 ++++++ bundles/org.eclipse.equinox.p2.updatechecker/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.equinox.p2.updatesite/.project | 6 ++++++ bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF | 3 ++- 16 files changed, 56 insertions(+), 8 deletions(-) (limited to 'bundles') diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/.project b/bundles/org.eclipse.equinox.p2.directorywatcher/.project index b26a90d31..349eb7607 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/.project +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF index ec1f7c0d2..d4994d86a 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Import-Package: org.eclipse.equinox.internal.p2.core.helpers, org.osgi.service.packageadmin;version="1.2.0", org.osgi.util.tracker;version="1.3.0" Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.3 + J2SE-1.4 Export-Package: org.eclipse.equinox.internal.provisional.p2.directorywatcher;x-friends:="org.eclipse.equinox.p2.reconciler.dropins,org.eclipse.equinox.p2.extensionlocation" Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.3.0,4.0)" Bundle-Activator: org.eclipse.equinox.internal.provisional.p2.directorywatcher.Activator diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/.project b/bundles/org.eclipse.equinox.p2.repository.tools/.project index 9cfb2757e..798ed3fd7 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/.project +++ b/bundles/org.eclipse.equinox.p2.repository.tools/.project @@ -30,9 +30,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF index 84fc38c11..6907d8e8d 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.equinox.p2.internal.repository.tools.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.3 + J2SE-1.4 Import-Package: org.apache.tools.ant, org.apache.tools.ant.types, org.eclipse.equinox.app;version="1.0.0", diff --git a/bundles/org.eclipse.equinox.p2.repository/.project b/bundles/org.eclipse.equinox.p2.repository/.project index e73906f61..120c0420d 100644 --- a/bundles/org.eclipse.equinox.p2.repository/.project +++ b/bundles/org.eclipse.equinox.p2.repository/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF index 3fec7d7fa..5712dd35f 100644 --- a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF @@ -14,7 +14,11 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.4, Bundle-Vendor: %providerName Import-Package: org.eclipse.equinox.internal.p2.repository.helpers, org.eclipse.equinox.internal.provisional.p2.core, - org.eclipse.equinox.security.storage + org.eclipse.equinox.security.storage, + javax.xml.parsers, + org.w3c.dom, + org.xml.sax, + org.xml.sax.helpers Export-Package: org.eclipse.equinox.internal.p2.persistence;x-friends:="org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.metadata.repository", org.eclipse.equinox.internal.p2.repository; x-friends:="org.eclipse.equinox.p2.artifact.repository, diff --git a/bundles/org.eclipse.equinox.p2.ui/.project b/bundles/org.eclipse.equinox.p2.ui/.project index 981de7141..06b02bb38 100644 --- a/bundles/org.eclipse.equinox.p2.ui/.project +++ b/bundles/org.eclipse.equinox.p2.ui/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF index 5b566f510..7ba003183 100644 --- a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF @@ -28,7 +28,10 @@ Import-Package: com.ibm.icu.text, org.eclipse.osgi.service.resolver;version="1.1.0", org.eclipse.osgi.util;version="1.1.0", org.osgi.framework;version="1.3.0", - org.osgi.service.packageadmin;version="1.2.0" + org.osgi.service.packageadmin;version="1.2.0", + javax.xml.parsers, + org.w3c.dom, + org.xml.sax Export-Package: org.eclipse.equinox.internal.p2.ui;x-internal:=true, org.eclipse.equinox.internal.p2.ui.dialogs;x-internal:=true, org.eclipse.equinox.internal.p2.ui.model;x-internal:=true, @@ -76,7 +79,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.equinox.simpleconfigurator.manipulator, org.eclipse.equinox.p2.exemplarysetup, org.eclipse.equinox.security.ui;bundle-version="[1.0.0,2.0.0)" - Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4, CDC-1.1/Foundation-1.1 diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IProvHelpContextIds.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IProvHelpContextIds.java index 701d8701e..392d94aa8 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IProvHelpContextIds.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IProvHelpContextIds.java @@ -9,6 +9,8 @@ import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; * or extended. *

* @since 3.4 + * @noextend This interface is not intended to be extended by clients. + * @noimplement This interface is not intended to be implemented by clients. */ public interface IProvHelpContextIds { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IStatusCodes.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IStatusCodes.java index 6982aa804..019b4dc9a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IStatusCodes.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IStatusCodes.java @@ -17,6 +17,7 @@ package org.eclipse.equinox.internal.provisional.p2.ui; * This interface is not intended to be implemented * * @since 3.4 + * @noimplement This interface is not intended to be implemented by clients. */ public interface IStatusCodes { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUIImages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUIImages.java index aa6578dae..89c4fa99a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUIImages.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUIImages.java @@ -27,6 +27,8 @@ import org.eclipse.swt.graphics.Image; * This class is not intended to be subclassed or instantiated by clients * * @since 3.4 + * @noextend This class is not intended to be subclassed by clients. + * @noinstantiate This class is not intended to be instantiated by clients. */ public class ProvUIImages { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUDragAdapter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUDragAdapter.java index 81969a7b4..0b0dc49ff 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUDragAdapter.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUDragAdapter.java @@ -19,7 +19,7 @@ import org.eclipse.swt.dnd.*; import org.eclipse.swt.widgets.Control; /** - * *Implements drag behaviour when IU items are dragged from a repository view. + * Implements drag behaviour when IU items are dragged from a repository view. * * @since 3.4 */ diff --git a/bundles/org.eclipse.equinox.p2.updatechecker/.project b/bundles/org.eclipse.equinox.p2.updatechecker/.project index 6e829559d..2ad31f02c 100644 --- a/bundles/org.eclipse.equinox.p2.updatechecker/.project +++ b/bundles/org.eclipse.equinox.p2.updatechecker/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/bundles/org.eclipse.equinox.p2.updatechecker/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.updatechecker/META-INF/MANIFEST.MF index 5c430570b..6f888e88b 100644 --- a/bundles/org.eclipse.equinox.p2.updatechecker/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.updatechecker/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Import-Package: org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.provisional.p2.query, org.osgi.framework;version="1.4.0" Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.3 + J2SE-1.4 Export-Package: org.eclipse.equinox.internal.p2.updatechecker;x-internal:=true, org.eclipse.equinox.internal.provisional.p2.updatechecker;x-friends:="org.eclipse.equinox.p2.ui.sdk.scheduler" Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.3.0,4.0)" diff --git a/bundles/org.eclipse.equinox.p2.updatesite/.project b/bundles/org.eclipse.equinox.p2.updatesite/.project index ca9b4f304..8f375c490 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/.project +++ b/bundles/org.eclipse.equinox.p2.updatesite/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF index 729ac74e0..67676187c 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF @@ -36,7 +36,8 @@ Import-Package: javax.xml.parsers, org.osgi.framework;version="1.3.0", org.osgi.util.tracker;version="1.3.0", org.xml.sax, - org.xml.sax.helpers + org.xml.sax.helpers, + org.w3c.dom Require-Bundle: org.eclipse.ecf.filetransfer, org.eclipse.ecf, org.eclipse.equinox.common;bundle-version="[3.3.0,4.0.0)", -- cgit v1.2.3