diff options
| author | Thomas Watson | 2012-11-12 21:32:47 +0000 |
|---|---|---|
| committer | Thomas Watson | 2012-11-12 21:41:52 +0000 |
| commit | 041162f9c4332154187af68a57dd3535967ee7ed (patch) | |
| tree | 42509af5d65414886278eb115e0c1a764d00e78b /bundles/org.eclipse.osgi/osgi | |
| parent | d83ff98985472a0eab236ecfceafe954d2fc873b (diff) | |
| download | rt.equinox.framework-041162f9c4332154187af68a57dd3535967ee7ed.tar.gz rt.equinox.framework-041162f9c4332154187af68a57dd3535967ee7ed.tar.xz rt.equinox.framework-041162f9c4332154187af68a57dd3535967ee7ed.zip | |
Update R6 OSGi API
Diffstat (limited to 'bundles/org.eclipse.osgi/osgi')
25 files changed, 269 insertions, 291 deletions
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/AdaptPermission.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/AdaptPermission.java index 3bc095bd2..c28a970b8 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/AdaptPermission.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/AdaptPermission.java @@ -424,9 +424,8 @@ public final class AdaptPermission extends BasicPermission { } /** - * Called by {@code <@link AdaptPermission#implies(Permission)>}. This - * method is only called on a requested permission which cannot have a - * filter set. + * Called by {@link AdaptPermission#implies(Permission)}. This method is + * only called on a requested permission which cannot have a filter set. * * @return a map of properties for this permission. */ diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/AdminPermission.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/AdminPermission.java index cd883e81f..6427b848a 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/AdminPermission.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/AdminPermission.java @@ -52,8 +52,10 @@ import java.util.Map; * lifecycle BundleContext.installBundle * Bundle.update * Bundle.uninstall - * listener BundleContext.addBundleListener for SynchronousBundleListener - * BundleContext.removeBundleListener for SynchronousBundleListener + * listener BundleContext.addBundleListener for + * SynchronousBundleListener + * BundleContext.removeBundleListener for + * SynchronousBundleListener * metadata Bundle.getHeaders * Bundle.getLocation * resolve FrameworkWiring.refreshBundles @@ -236,8 +238,9 @@ public final class AdminPermission extends BasicPermission { * Examples: * * <pre> - * (signer=\*,o=ACME,c=US) - * (&(signer=\*,o=ACME,c=US)(name=com.acme.*)(location=http://www.acme.com/bundles/*)) + * (signer=\*,o=ACME,c=US) + * (&(signer=\*,o=ACME,c=US)(name=com.acme.*) + * (location=http://www.acme.com/bundles/*)) * (id>=1) * </pre> * diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Bundle.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Bundle.java index 8a58ab72a..07244666a 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Bundle.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Bundle.java @@ -44,12 +44,12 @@ import org.osgi.framework.wiring.FrameworkWiring; * <p> * A bundle can be in one of six states: * <ul> - * <li>{@link #UNINSTALLED} - * <li>{@link #INSTALLED} - * <li>{@link #RESOLVED} - * <li>{@link #STARTING} - * <li>{@link #STOPPING} - * <li>{@link #ACTIVE} + * <li>{@link #UNINSTALLED}</li> + * <li>{@link #INSTALLED}</li> + * <li>{@link #RESOLVED}</li> + * <li>{@link #STARTING}</li> + * <li>{@link #STOPPING}</li> + * <li>{@link #ACTIVE}</li> * </ul> * <p> * Values assigned to these states have no specified ordering; they represent @@ -114,14 +114,14 @@ public interface Bundle extends Comparable<Bundle> { * include: * <ul> * <li>The bundle's class path from its {@link Constants#BUNDLE_CLASSPATH} - * Manifest header. + * Manifest header.</li> * <li>The bundle's package dependencies from its * {@link Constants#EXPORT_PACKAGE} and {@link Constants#IMPORT_PACKAGE} - * Manifest headers. + * Manifest headers.</li> * <li>The bundle's required bundle dependencies from its - * {@link Constants#REQUIRE_BUNDLE} Manifest header. + * {@link Constants#REQUIRE_BUNDLE} Manifest header.</li> * <li>A fragment bundle's host dependency from its - * {@link Constants#FRAGMENT_HOST} Manifest header. + * {@link Constants#FRAGMENT_HOST} Manifest header.</li> * </ul> * <p> * Note that the bundle is not active yet. A bundle must be put in the @@ -262,12 +262,11 @@ public interface Bundle extends Comparable<Bundle> { * <ul> * <li>If the {@link #START_TRANSIENT} option is set, then a * {@code BundleException} is thrown indicating this bundle cannot be - * started due to the Framework's current start level. - * + * started due to the Framework's current start level.</li> * <li>Otherwise, the Framework must set this bundle's persistent autostart * setting to <em>Started with declared activation</em> if the * {@link #START_ACTIVATION_POLICY} option is set or - * <em>Started with eager activation</em> if not set. + * <em>Started with eager activation</em> if not set.</li> * </ul> * <p> * When the Framework's current start level becomes equal to or more than @@ -279,82 +278,74 @@ public interface Bundle extends Comparable<Bundle> { * then this method must wait for activation or deactivation to complete * before continuing. If this does not occur in a reasonable time, a * {@code BundleException} is thrown to indicate this bundle was unable to - * be started. - * + * be started.</li> * <li>If this bundle's state is {@code ACTIVE} then this method returns - * immediately. - * + * immediately.</li> * <li>If the {@link #START_TRANSIENT} option is not set then set this * bundle's autostart setting to <em>Started with declared activation</em> * if the {@link #START_ACTIVATION_POLICY} option is set or * <em>Started with eager activation</em> if not set. When the Framework is * restarted and this bundle's autostart setting is not <em>Stopped</em>, - * this bundle must be automatically started. - * + * this bundle must be automatically started.</li> * <li>If this bundle's state is not {@code RESOLVED}, an attempt is made to * resolve this bundle. If the Framework cannot resolve this bundle, a - * {@code BundleException} is thrown. - * + * {@code BundleException} is thrown.</li> * <li>If the {@link #START_ACTIVATION_POLICY} option is set and this * bundle's declared activation policy is {@link Constants#ACTIVATION_LAZY * lazy} then: * <ul> * <li>If this bundle's state is {@code STARTING} then this method returns - * immediately. - * <li>This bundle's state is set to {@code STARTING}. - * <li>A bundle event of type {@link BundleEvent#LAZY_ACTIVATION} is fired. + * immediately.</li> + * <li>This bundle's state is set to {@code STARTING}.</li> + * <li>A bundle event of type {@link BundleEvent#LAZY_ACTIVATION} is fired.</li> * <li>This method returns immediately and the remaining steps will be - * followed when this bundle's activation is later triggered. + * followed when this bundle's activation is later triggered.</li> * </ul> - * <i></i> - * <li>This bundle's state is set to {@code STARTING}. - * - * <li>A bundle event of type {@link BundleEvent#STARTING} is fired. - * + * </li> + * <li>This bundle's state is set to {@code STARTING}.</li> + * <li>A bundle event of type {@link BundleEvent#STARTING} is fired.</li> * <li>The {@link BundleActivator#start(BundleContext)} method of this * bundle's {@code BundleActivator}, if one is specified, is called. If the * {@code BundleActivator} is invalid or throws an exception then: * <ul> - * <li>This bundle's state is set to {@code STOPPING}. - * <li>A bundle event of type {@link BundleEvent#STOPPING} is fired. - * <li>Any services registered by this bundle must be unregistered. - * <li>Any services used by this bundle must be released. - * <li>Any listeners registered by this bundle must be removed. - * <li>This bundle's state is set to {@code RESOLVED}. - * <li>A bundle event of type {@link BundleEvent#STOPPED} is fired. - * <li>A {@code BundleException} is then thrown. + * <li>This bundle's state is set to {@code STOPPING}.</li> + * <li>A bundle event of type {@link BundleEvent#STOPPING} is fired.</li> + * <li>Any services registered by this bundle must be unregistered.</li> + * <li>Any services used by this bundle must be released.</li> + * <li>Any listeners registered by this bundle must be removed.</li> + * <li>This bundle's state is set to {@code RESOLVED}.</li> + * <li>A bundle event of type {@link BundleEvent#STOPPED} is fired.</li> + * <li>A {@code BundleException} is then thrown.</li> * </ul> - * <i></i> + * </li> * <li>If this bundle's state is {@code UNINSTALLED}, because this bundle * was uninstalled while the {@code BundleActivator.start} method was - * running, a {@code BundleException} is thrown. - * - * <li>This bundle's state is set to {@code ACTIVE}. - * - * <li>A bundle event of type {@link BundleEvent#STARTED} is fired. + * running, a {@code BundleException} is thrown.</li> + * <li>This bundle's state is set to {@code ACTIVE}.</li> + * <li>A bundle event of type {@link BundleEvent#STARTED} is fired.</li> * </ol> * * <b>Preconditions </b> * <ul> * <li>{@code getState()} in { {@code INSTALLED}, {@code RESOLVED} * } or { {@code INSTALLED}, {@code RESOLVED}, - * {@code STARTING} } if this bundle has a lazy activation policy. + * {@code STARTING} } if this bundle has a lazy activation policy.</li> * </ul> * <b>Postconditions, no exceptions thrown </b> * <ul> * <li>Bundle autostart setting is modified unless the - * {@link #START_TRANSIENT} option was set. + * {@link #START_TRANSIENT} option was set.</li> * <li>{@code getState()} in { {@code ACTIVE} } unless the - * lazy activation policy was used. + * lazy activation policy was used.</li> * <li>{@code BundleActivator.start()} has been called and did not throw an - * exception unless the lazy activation policy was used. + * exception unless the lazy activation policy was used.</li> * </ul> * <b>Postconditions, when an exception is thrown </b> * <ul> * <li>Depending on when the exception occurred, bundle autostart setting is - * modified unless the {@link #START_TRANSIENT} option was set. + * modified unless the {@link #START_TRANSIENT} option was set.</li> * <li>{@code getState()} not in { {@code STARTING}, {@code ACTIVE} - * }. + * }.</li> * </ul> * * @param options The options for starting this bundle. See @@ -404,62 +395,53 @@ public interface Bundle extends Comparable<Bundle> { * The following steps are required to stop a bundle: * <ol> * <li>If this bundle's state is {@code UNINSTALLED} then an - * {@code IllegalStateException} is thrown. - * + * {@code IllegalStateException} is thrown.</li> * <li>If this bundle is in the process of being activated or deactivated * then this method must wait for activation or deactivation to complete * before continuing. If this does not occur in a reasonable time, a * {@code BundleException} is thrown to indicate this bundle was unable to - * be stopped. + * be stopped.</li> * <li>If the {@link #STOP_TRANSIENT} option is not set then then set this * bundle's persistent autostart setting to to <em>Stopped</em>. When the * Framework is restarted and this bundle's autostart setting is - * <em>Stopped</em>, this bundle must not be automatically started. - * + * <em>Stopped</em>, this bundle must not be automatically started.</li> * <li>If this bundle's state is not {@code STARTING} or {@code ACTIVE} then - * this method returns immediately. - * - * <li>This bundle's state is set to {@code STOPPING}. - * - * <li>A bundle event of type {@link BundleEvent#STOPPING} is fired. - * + * this method returns immediately.</li> + * <li>This bundle's state is set to {@code STOPPING}.</li> + * <li>A bundle event of type {@link BundleEvent#STOPPING} is fired.</li> * <li>If this bundle's state was {@code ACTIVE} prior to setting the state * to {@code STOPPING}, the {@link BundleActivator#stop(BundleContext)} * method of this bundle's {@code BundleActivator}, if one is specified, is * called. If that method throws an exception, this method must continue to * stop this bundle and a {@code BundleException} must be thrown after - * completion of the remaining steps. - * - * <li>Any services registered by this bundle must be unregistered. - * <li>Any services used by this bundle must be released. - * <li>Any listeners registered by this bundle must be removed. - * + * completion of the remaining steps.</li> + * <li>Any services registered by this bundle must be unregistered.</li> + * <li>Any services used by this bundle must be released.</li> + * <li>Any listeners registered by this bundle must be removed.</li> * <li>If this bundle's state is {@code UNINSTALLED}, because this bundle * was uninstalled while the {@code BundleActivator.stop} method was - * running, a {@code BundleException} must be thrown. - * - * <li>This bundle's state is set to {@code RESOLVED}. - * - * <li>A bundle event of type {@link BundleEvent#STOPPED} is fired. + * running, a {@code BundleException} must be thrown.</li> + * <li>This bundle's state is set to {@code RESOLVED}.</li> + * <li>A bundle event of type {@link BundleEvent#STOPPED} is fired.</li> * </ol> * * <b>Preconditions </b> * <ul> - * <li>{@code getState()} in { {@code ACTIVE} }. + * <li>{@code getState()} in { {@code ACTIVE} }.</li> * </ul> * <b>Postconditions, no exceptions thrown </b> * <ul> * <li>Bundle autostart setting is modified unless the - * {@link #STOP_TRANSIENT} option was set. + * {@link #STOP_TRANSIENT} option was set.</li> * <li>{@code getState()} not in { {@code ACTIVE}, {@code STOPPING} - * }. + * }.</li> * <li>{@code BundleActivator.stop} has been called and did not throw an - * exception. + * exception.</li> * </ul> * <b>Postconditions, when an exception is thrown </b> * <ul> * <li>Bundle autostart setting is modified unless the - * {@link #STOP_TRANSIENT} option was set. + * {@link #STOP_TRANSIENT} option was set.</li> * </ul> * * @param options The options for stopping this bundle. See @@ -520,45 +502,40 @@ public interface Bundle extends Comparable<Bundle> { * The following steps are required to update a bundle: * <ol> * <li>If this bundle's state is {@code UNINSTALLED} then an - * {@code IllegalStateException} is thrown. - * + * {@code IllegalStateException} is thrown.</li> * <li>If this bundle's state is {@code ACTIVE}, {@code STARTING} or * {@code STOPPING}, this bundle is stopped as described in the * {@code Bundle.stop} method. If {@code Bundle.stop} throws an exception, - * the exception is rethrown terminating the update. - * + * the exception is rethrown terminating the update.</li> * <li>The updated version of this bundle is read from the input stream and * installed. If the Framework is unable to install the updated version of * this bundle, the original version of this bundle must be restored and a * {@code BundleException} must be thrown after completion of the remaining - * steps. - * - * <li>This bundle's state is set to {@code INSTALLED}. - * + * steps.</li> + * <li>This bundle's state is set to {@code INSTALLED}.</li> * <li>If the updated version of this bundle was successfully installed, a - * bundle event of type {@link BundleEvent#UPDATED} is fired. - * + * bundle event of type {@link BundleEvent#UPDATED} is fired.</li> * <li>If this bundle's state was originally {@code ACTIVE}, the updated * bundle is started as described in the {@code Bundle.start} method. If * {@code Bundle.start} throws an exception, a Framework event of type - * {@link FrameworkEvent#ERROR} is fired containing the exception. + * {@link FrameworkEvent#ERROR} is fired containing the exception.</li> * </ol> * * <b>Preconditions </b> * <ul> - * <li>{@code getState()} not in { {@code UNINSTALLED} }. + * <li>{@code getState()} not in { {@code UNINSTALLED} }.</li> * </ul> * <b>Postconditions, no exceptions thrown </b> * <ul> * <li>{@code getState()} in { {@code INSTALLED}, {@code RESOLVED}, - * {@code ACTIVE} }. - * <li>This bundle has been updated. + * {@code ACTIVE} }.</li> + * <li>This bundle has been updated.</li> * </ul> * <b>Postconditions, when an exception is thrown </b> * <ul> * <li>{@code getState()} in { {@code INSTALLED}, {@code RESOLVED}, - * {@code ACTIVE} }. - * <li>Original bundle is still used; no update occurred. + * {@code ACTIVE} }.</li> + * <li>Original bundle is still used; no update occurred.</li> * </ul> * * @param input The {@code InputStream} from which to read the new bundle or @@ -633,35 +610,31 @@ public interface Bundle extends Comparable<Bundle> { * The following steps are required to uninstall a bundle: * <ol> * <li>If this bundle's state is {@code UNINSTALLED} then an - * {@code IllegalStateException} is thrown. - * + * {@code IllegalStateException} is thrown.</li> * <li>If this bundle's state is {@code ACTIVE}, {@code STARTING} or * {@code STOPPING}, this bundle is stopped as described in the * {@code Bundle.stop} method. If {@code Bundle.stop} throws an exception, a * Framework event of type {@link FrameworkEvent#ERROR} is fired containing - * the exception. - * - * <li>This bundle's state is set to {@code UNINSTALLED}. - * - * <li>A bundle event of type {@link BundleEvent#UNINSTALLED} is fired. - * + * the exception.</li> + * <li>This bundle's state is set to {@code UNINSTALLED}.</li> + * <li>A bundle event of type {@link BundleEvent#UNINSTALLED} is fired.</li> * <li>This bundle and any persistent storage area provided for this bundle - * by the Framework are removed. + * by the Framework are removed.</li> * </ol> * * <b>Preconditions </b> * <ul> - * <li>{@code getState()} not in { {@code UNINSTALLED} }. + * <li>{@code getState()} not in { {@code UNINSTALLED} }.</li> * </ul> * <b>Postconditions, no exceptions thrown </b> * <ul> - * <li>{@code getState()} in { {@code UNINSTALLED} }. - * <li>This bundle has been uninstalled. + * <li>{@code getState()} in { {@code UNINSTALLED} }.</li> + * <li>This bundle has been uninstalled.</li> * </ul> * <b>Postconditions, when an exception is thrown </b> * <ul> - * <li>{@code getState()} not in { {@code UNINSTALLED} }. - * <li>This Bundle has not been uninstalled. + * <li>{@code getState()} not in { {@code UNINSTALLED} }.</li> + * <li>This Bundle has not been uninstalled.</li> * </ul> * * @throws BundleException If the uninstall failed. This can occur if @@ -727,12 +700,12 @@ public interface Bundle extends Comparable<Bundle> { * <p> * A bundle's unique identifier has the following attributes: * <ul> - * <li>Is unique and persistent. - * <li>Is a {@code long}. + * <li>Is unique and persistent.</li> + * <li>Is a {@code long}.</li> * <li>Its value is not reused for another bundle, even after a bundle is - * uninstalled. - * <li>Does not change while a bundle remains installed. - * <li>Does not change when a bundle is updated. + * uninstalled.</li> + * <li>Does not change while a bundle remains installed.</li> + * <li>Does not change when a bundle is updated.</li> * </ul> * * <p> diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleActivator.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleActivator.java index f5b2debe0..45c8b37f5 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleActivator.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleActivator.java @@ -34,10 +34,10 @@ package org.osgi.framework; * {@code BundleActivator}. The form of the Manifest header is: * * <p> - * {@code Bundle-Activator: <i>class-name</i>} + * {@code Bundle-Activator:} <i>class-name</i> * * <p> - * where {@code <i>class-name</i>} is a fully qualified Java classname. + * where <i>class-name</i> is a fully qualified Java classname. * <p> * The specified {@code BundleActivator} class must have a public constructor * that takes no parameters so that a {@code BundleActivator} object can be diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java index 4f166fd27..8913c2f07 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java @@ -29,15 +29,15 @@ import java.util.Dictionary; * <p> * {@code BundleContext} methods allow a bundle to: * <ul> - * <li>Subscribe to events published by the Framework. - * <li>Register service objects with the Framework service registry. - * <li>Retrieve {@code ServiceReferences} from the Framework service registry. - * <li>Get and release service objects for a referenced service. - * <li>Install new bundles in the Framework. - * <li>Get the list of bundles installed in the Framework. - * <li>Get the {@link Bundle} object for a bundle. + * <li>Subscribe to events published by the Framework.</li> + * <li>Register service objects with the Framework service registry.</li> + * <li>Retrieve {@code ServiceReferences} from the Framework service registry.</li> + * <li>Get and release service objects for a referenced service.</li> + * <li>Install new bundles in the Framework.</li> + * <li>Get the list of bundles installed in the Framework.</li> + * <li>Get the {@link Bundle} object for a bundle.</li> * <li>Create {@code File} objects for files in a persistent storage area - * provided for the bundle by the Framework. + * provided for the bundle by the Framework.</li> * </ul> * * <p> @@ -127,29 +127,24 @@ public interface BundleContext extends BundleReference { * The following steps are required to install a bundle: * <ol> * <li>If a bundle containing the same location identifier is already - * installed, the {@code Bundle} object for that bundle is returned. - * + * installed, the {@code Bundle} object for that bundle is returned.</li> * <li>The bundle's content is read from the input stream. If this fails, a - * {@link BundleException} is thrown. - * + * {@link BundleException} is thrown.</li> * <li>The bundle's associated resources are allocated. The associated * resources minimally consist of a unique identifier and a persistent * storage area if the platform has file system support. If this step fails, - * a {@code BundleException} is thrown. - * - * <li>The bundle's state is set to {@code INSTALLED}. - * - * <li>A bundle event of type {@link BundleEvent#INSTALLED} is fired. - * + * a {@code BundleException} is thrown.</li> + * <li>The bundle's state is set to {@code INSTALLED}.</li> + * <li>A bundle event of type {@link BundleEvent#INSTALLED} is fired.</li> * <li>The {@code Bundle} object for the newly or previously installed - * bundle is returned. + * bundle is returned.</li> * </ol> * * <b>Postconditions, no exceptions thrown </b> * <ul> * <li>{@code getState()} in { {@code INSTALLED}, {@code RESOLVED} - * }. - * <li>Bundle has a unique ID. + * }.</li> + * <li>Bundle has a unique ID.</li> * </ul> * <b>Postconditions, when an exception is thrown </b> * <ul> @@ -388,21 +383,23 @@ public interface BundleContext extends BundleReference { * <ol> * <li>If {@code service} is not a {@code ServiceFactory}, an * {@code IllegalArgumentException} is thrown if {@code service} is not an - * {@code instanceof} all the specified class names. + * {@code instanceof} all the specified class names.</li> * <li>The Framework adds the following service properties to the service * properties from the specified {@code Dictionary} (which may be - * {@code null}): <br/> - * A property named {@link Constants#SERVICE_ID} identifying the - * registration number of the service <br/> - * A property named {@link Constants#OBJECTCLASS} containing all the - * specified classes. <br/> + * {@code null}): + * <ul> + * <li>A property named {@link Constants#SERVICE_ID} identifying the + * registration number of the service</li> + * <li>A property named {@link Constants#OBJECTCLASS} containing all the + * specified classes.</li> + * </ul> * Properties with these names in the specified {@code Dictionary} will be - * ignored. + * ignored.</li> * <li>The service is added to the Framework service registry and may now be - * used by other bundles. - * <li>A service event of type {@link ServiceEvent#REGISTERED} is fired. + * used by other bundles.</li> + * <li>A service event of type {@link ServiceEvent#REGISTERED} is fired.</li> * <li>A {@code ServiceRegistration} object for this registration is - * returned. + * returned.</li> * </ol> * * @param clazzes The class names under which the service can be located. @@ -422,10 +419,10 @@ public interface BundleContext extends BundleReference { * unregister the service. * @throws IllegalArgumentException If one of the following is true: * <ul> - * <li>{@code service} is {@code null}. <li>{@code service} is not a - * {@code ServiceFactory} object and is not an instance of all the - * named classes in {@code clazzes}. <li> {@code properties} - * contains case variants of the same key name. + * <li>{@code service} is {@code null}.</li><li>{@code service} is + * not a {@code ServiceFactory} object and is not an instance of all + * the named classes in {@code clazzes}.</li><li> {@code properties} + * contains case variants of the same key name.</li> * </ul> * @throws SecurityException If the caller does not have the * {@code ServicePermission} to register the service for all the @@ -513,16 +510,16 @@ public interface BundleContext extends BundleReference { * service must have been registered with the specified class name. The * complete list of class names with which a service was registered is * available from the service's {@link Constants#OBJECTCLASS objectClass} - * property. + * property.</li> * <li>If the specified {@code filter} is not {@code null}, the filter - * expression must match the service. + * expression must match the service.</li> * <li>If the Java Runtime Environment supports permissions, the caller must * have {@code ServicePermission} with the {@code GET} action for at least - * one of the class names under which the service was registered. + * one of the class names under which the service was registered.</li> * <li>For each class name with which the service was registered, calling * {@link ServiceReference#isAssignableTo(Bundle, String)} with the context * bundle and the class name on the service's {@code ServiceReference} - * object must return {@code true} + * object must return {@code true}</li> * </ul> * * @param clazz The class name with which the service was registered or @@ -565,12 +562,12 @@ public interface BundleContext extends BundleReference { * service must have been registered with the specified class name. The * complete list of class names with which a service was registered is * available from the service's {@link Constants#OBJECTCLASS objectClass} - * property. + * property.</li> * <li>If the specified {@code filter} is not {@code null}, the filter - * expression must match the service. + * expression must match the service.</li> * <li>If the Java Runtime Environment supports permissions, the caller must * have {@code ServicePermission} with the {@code GET} action for at least - * one of the class names under which the service was registered. + * one of the class names under which the service was registered.</li> * </ul> * * @param clazz The class name with which the service was registered or @@ -681,16 +678,16 @@ public interface BundleContext extends BundleReference { * <li>The service must have been registered with the name of the specified * class. The complete list of class names with which a service was * registered is available from the service's {@link Constants#OBJECTCLASS - * objectClass} property. + * objectClass} property.</li> * <li>If the specified {@code filter} is not {@code null}, the filter - * expression must match the service. + * expression must match the service.</li> * <li>If the Java Runtime Environment supports permissions, the caller must * have {@code ServicePermission} with the {@code GET} action for at least - * one of the class names under which the service was registered. + * one of the class names under which the service was registered.</li> * <li>For each class name with which the service was registered, calling * {@link ServiceReference#isAssignableTo(Bundle, String)} with the context * bundle and the class name on the service's {@code ServiceReference} - * object must return {@code true} + * object must return {@code true}</li> * </ul> * * @param <S> Type of Service @@ -727,7 +724,7 @@ public interface BundleContext extends BundleReference { * <p> * The following steps are required to get the service object: * <ol> - * <li>If the service has been unregistered, {@code null} is returned. + * <li>If the service has been unregistered, {@code null} is returned.</li> * <li>If the context bundle's use count for the service is currently zero * and the service was registered with an object implementing the * {@code ServiceFactory} interface, the @@ -738,14 +735,14 @@ public interface BundleContext extends BundleReference { * registered or the {@code ServiceFactory} object throws an exception or * will be recursively called for the context bundle, {@code null} is * returned and a Framework event of type {@link FrameworkEvent#ERROR} - * containing a {@link ServiceException} describing the error is fired. <br> - * This service object is cached by the Framework. While the context - * bundle's use count for the service is greater than zero, subsequent calls - * to get the services's service object for the context bundle will return - * the cached service object. + * containing a {@link ServiceException} describing the error is fired. This + * service object is cached by the Framework. While the context bundle's use + * count for the service is greater than zero, subsequent calls to get the + * services's service object for the context bundle will return the cached + * service object.</li> * <li>The context bundle's use count for this service is incremented by - * one. - * <li>The service object for the service is returned. + * one.</li> + * <li>The service object for the service is returned.</li> * </ol> * * @param <S> Type of Service. @@ -784,14 +781,14 @@ public interface BundleContext extends BundleReference { * The following steps are required to unget the service object: * <ol> * <li>If the context bundle's use count for the service is zero or the - * service has been unregistered, {@code false} is returned. + * service has been unregistered, {@code false} is returned.</li> * <li>The context bundle's use count for this service is decremented by - * one. + * one.</li> * <li>If the context bundle's use count for the service is currently zero * and the service was registered with a {@code ServiceFactory} object, the * {@link ServiceFactory#ungetService(Bundle, ServiceRegistration, Object)} - * method is called to release the service object for the context bundle. - * <li>{@code true} is returned. + * method is called to release the service object for the context bundle.</li> + * <li>{@code true} is returned.</li> * </ol> * * @param reference A reference to the service to be released. diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleEvent.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleEvent.java index 9e2102212..e96b8598f 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleEvent.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleEvent.java @@ -201,16 +201,16 @@ public class BundleEvent extends EventObject { /** * Returns the type of lifecyle event. The type values are: * <ul> - * <li>{@link #INSTALLED} - * <li>{@link #RESOLVED} - * <li>{@link #LAZY_ACTIVATION} - * <li>{@link #STARTING} - * <li>{@link #STARTED} - * <li>{@link #STOPPING} - * <li>{@link #STOPPED} - * <li>{@link #UPDATED} - * <li>{@link #UNRESOLVED} - * <li>{@link #UNINSTALLED} + * <li>{@link #INSTALLED}</li> + * <li>{@link #RESOLVED}</li> + * <li>{@link #LAZY_ACTIVATION}</li> + * <li>{@link #STARTING}</li> + * <li>{@link #STARTED}</li> + * <li>{@link #STOPPING}</li> + * <li>{@link #STOPPED}</li> + * <li>{@link #UPDATED}</li> + * <li>{@link #UNRESOLVED}</li> + * <li>{@link #UNINSTALLED}</li> * </ul> * * @return The type of lifecycle event. diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/CapabilityPermission.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/CapabilityPermission.java index b17bcaec9..d57e79740 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/CapabilityPermission.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/CapabilityPermission.java @@ -41,9 +41,9 @@ import java.util.Set; * A bundle's authority to provide or require a capability. * <ul> * <li>The {@code provide} action allows a bundle to provide a capability - * matching the specified filter. + * matching the specified filter.</li> * <li>The {@code require} action allows a bundle to require a capability - * matching the specified filter. + * matching the specified filter.</li> * </ul> * * @ThreadSafe @@ -486,9 +486,8 @@ public final class CapabilityPermission extends BasicPermission { } /** - * Called by {@code <@link CapabilityPermission#implies(Permission)>}. This - * method is only called on a requested permission which cannot have a - * filter set. + * Called by {@link CapabilityPermission#implies(Permission)}. This method + * is only called on a requested permission which cannot have a filter set. * * @return a map of properties for this permission. */ diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkEvent.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkEvent.java index f679c7581..dac4691af 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkEvent.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkEvent.java @@ -223,16 +223,16 @@ public class FrameworkEvent extends EventObject { * <p> * The type values are: * <ul> - * <li>{@link #STARTED} - * <li>{@link #ERROR} - * <li>{@link #WARNING} - * <li>{@link #INFO} - * <li>{@link #PACKAGES_REFRESHED} - * <li>{@link #STARTLEVEL_CHANGED} - * <li>{@link #STOPPED} - * <li>{@link #STOPPED_BOOTCLASSPATH_MODIFIED} - * <li>{@link #STOPPED_UPDATE} - * <li>{@link #WAIT_TIMEDOUT} + * <li>{@link #STARTED}</li> + * <li>{@link #ERROR}</li> + * <li>{@link #WARNING}</li> + * <li>{@link #INFO}</li> + * <li>{@link #PACKAGES_REFRESHED}</li> + * <li>{@link #STARTLEVEL_CHANGED}</li> + * <li>{@link #STOPPED}</li> + * <li>{@link #STOPPED_BOOTCLASSPATH_MODIFIED}</li> + * <li>{@link #STOPPED_UPDATE}</li> + * <li>{@link #WAIT_TIMEDOUT}</li> * </ul> * * @return The type of state change. diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java index 1f46ea2bb..5112a2301 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java @@ -2056,7 +2056,7 @@ public class FrameworkUtil { * "cn=me,c=US;*;cn=you" will match * "cn=me,c=US";cn=you" and "cn=me,c=US;cn=her;cn=you". The * pattern "cn=me,c=US;-;cn=you" will match "cn=me,c=US";cn=you" - * and "cn=me,c=US;cn=her;cn=him;cn=you". + * and "cn=me,c=US;cn=her;cn=him;cn=you".</li> * <li>As a DN prefix. In this case, the DN must start with "*,". * The wild card will match zero or more RDNs at the start of a * DN. For example, "*,cn=me,c=US;cn=you" will match diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java index e993fbc36..4f9324c0e 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java @@ -525,9 +525,8 @@ public final class PackagePermission extends BasicPermission { } /** - * Called by {@code <@link PackagePermission#implies(Permission)>}. This - * method is only called on a requested permission which cannot have a - * filter set. + * Called by {@link PackagePermission#implies(Permission)}. This method is + * only called on a requested permission which cannot have a filter set. * * @return a map of properties for this permission. */ diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServicePermission.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServicePermission.java index 96438ad16..eb144295b 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServicePermission.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServicePermission.java @@ -42,8 +42,8 @@ import java.util.Set; * A bundle's authority to register or get a service. * <ul> * <li>The {@code register} action allows a bundle to register a service on the - * specified names. - * <li>The {@code get} action allows a bundle to detect a service and get it. + * specified names.</li> + * <li>The {@code get} action allows a bundle to detect a service and get it.</li> * </ul> * Permission to get a service is required in order to detect events regarding * the service. Untrusted bundles should not be able to detect the presence of @@ -538,9 +538,8 @@ public final class ServicePermission extends BasicPermission { } /** - * Called by {@code <@link ServicePermission#implies(Permission)>}. This - * method is only called on a requested permission which cannot have a - * filter set. + * Called by {@link ServicePermission#implies(Permission)}. This method is + * only called on a requested permission which cannot have a filter set. * * @return a map of properties for this permission. */ diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceRegistration.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceRegistration.java index a84248da0..ad3d1ff7a 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceRegistration.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceRegistration.java @@ -60,8 +60,8 @@ public interface ServiceRegistration<S> { * <p> * The following steps are required to modify service properties: * <ol> - * <li>The service's properties are replaced with the provided properties. - * <li>A service event of type {@link ServiceEvent#MODIFIED} is fired. + * <li>The service's properties are replaced with the provided properties.</li> + * <li>A service event of type {@link ServiceEvent#MODIFIED} is fired.</li> * </ol> * * @param properties The properties for this service. See {@link Constants} @@ -86,18 +86,21 @@ public interface ServiceRegistration<S> { * The following steps are required to unregister a service: * <ol> * <li>The service is removed from the Framework service registry so that it - * can no longer be obtained. + * can no longer be obtained.</li> * <li>A service event of type {@link ServiceEvent#UNREGISTERING} is fired * so that bundles using this service can release their use of the service. * Once delivery of the service event is complete, the * {@code ServiceReference} objects for the service may no longer be used to - * get a service object for the service. + * get a service object for the service.</li> * <li>For each bundle whose use count for this service is greater than - * zero: <br> - * The bundle's use count for this service is set to zero. <br> - * If the service was registered with a {@link ServiceFactory} object, the - * {@code ServiceFactory.ungetService} method is called to release the - * service object for the bundle. + * zero: + * <ul> + * <li>The bundle's use count for this service is set to zero.</li> + * <li>If the service was registered with a {@link ServiceFactory} object, + * the {@code ServiceFactory.ungetService} method is called to release the + * service object for the bundle.</li> + * </ul> + * </li> * </ol> * * @throws IllegalStateException If this {@code ServiceRegistration} object diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/CollisionHook.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/CollisionHook.java index a1a25ee04..11cbddb52 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/CollisionHook.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/CollisionHook.java @@ -54,17 +54,17 @@ public interface CollisionHook { * on the operation type the target bundle and the collision candidate * collection are the following: * <ul> - * <li> {@link #INSTALLING installing} - The target is the bundle associated + * <li>{@link #INSTALLING installing} - The target is the bundle associated * with the {@link BundleContext} used to call one of the * {@link BundleContext#installBundle(String) install} methods. The * collision candidate collection contains the existing bundles installed * which have the same symbolic name and version as the bundle being - * installed. - * <li> {@link #UPDATING updating} - The target is the bundle used to call + * installed.</li> + * <li>{@link #UPDATING updating} - The target is the bundle used to call * one of the {@link Bundle#update() update} methods. The collision * candidate collection contains the existing bundles installed which have * the same symbolic name and version as the content the target bundle is - * being updated to. + * being updated to.</li> * </ul> * This method can filter the collection of collision candidates by removing * potential collisions. For the specified operation to succeed, the diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHook.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHook.java index 9d3ef6240..325aec709 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHook.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHook.java @@ -71,51 +71,47 @@ import org.osgi.framework.wiring.FrameworkWiring; * <li>For each bundle revision {@code B} left in the shrinkable collection * {@code Resolvable} and any bundle revision {@code B} which is currently * resolved that represents a singleton bundle do the following: - * <p/> - * Determine the collection of available capabilities that have a namespace of - * {@link IdentityNamespace osgi.identity}, are singletons, and have the same + * <ul> + * <li>Determine the collection of available capabilities that have a namespace + * of {@link IdentityNamespace osgi.identity}, are singletons, and have the same * symbolic name as the singleton bundle revision {@code B} and place each of - * the matching capabilities into a shrinkable collection {@code Collisions}. - * <p/> - * Remove the {@link IdentityNamespace osgi.identity} capability provided by + * the matching capabilities into a shrinkable collection {@code Collisions}.</li> + * <li>Remove the {@link IdentityNamespace osgi.identity} capability provided by * bundle revision {@code B} from shrinkable collection {@code Collisions}. A - * singleton bundle cannot collide with itself. - * <p/> - * For each resolver hook call the + * singleton bundle cannot collide with itself.</li> + * <li>For each resolver hook call the * {@link #filterSingletonCollisions(BundleCapability, Collection)} with the * {@link IdentityNamespace osgi.identity} capability provided by bundle - * revision {@code B} and the shrinkable collection {@code Collisions} - * <p/> - * The shrinkable collection {@code Collisions} now contains all singleton + * revision {@code B} and the shrinkable collection {@code Collisions}</li> + * <li>The shrinkable collection {@code Collisions} now contains all singleton * {@link IdentityNamespace osgi.identity} capabilities that can influence the - * ability of bundle revision {@code B} to resolve. - * <p/> - * If the bundle revision {@code B} is already resolved then any resolvable + * ability of bundle revision {@code B} to resolve.</li> + * <li>If the bundle revision {@code B} is already resolved then any resolvable * bundle revision contained in the collection {@code Collisions} is not allowed * to resolve.</li> + * </ul> + * </li> * <li>During a resolve process a framework is free to attempt to resolve any or * all bundles contained in shrinkable collection {@code Resolvable}. For each * bundle revision {@code B} left in the shrinkable collection * {@code Resolvable} which the framework attempts to resolve the following * steps must be followed: - * <p/> - * For each requirement {@code R} specified by bundle revision {@code B} + * <ul> + * <li>For each requirement {@code R} specified by bundle revision {@code B} * determine the collection of capabilities that satisfy (or match) the * requirement and place each matching capability into a shrinkable collection * {@code Candidates}. A capability is considered to match a particular * requirement if its attributes satisfy a specified requirement and the - * requirer bundle has permission to access the capability. - * - * <p/> - * For each resolver hook call the + * requirer bundle has permission to access the capability.</li> + * <li>For each resolver hook call the * {@link #filterMatches(BundleRequirement, Collection)} with the requirement - * {@code R} and the shrinkable collection {@code Candidates}. - * - * <p/> - * The shrinkable collection {@code Candidates} now contains all the + * {@code R} and the shrinkable collection {@code Candidates}.</li> + * <li>The shrinkable collection {@code Candidates} now contains all the * capabilities that may be used to satisfy the requirement {@code R}. Any other * capabilities that got removed from the shrinkable collection * {@code Candidates} must not be used to satisfy requirement {@code R}.</li> + * </ul> + * </li> * <li>For each resolver hook call the {@link #end()} method to inform the hooks * about a resolve process ending.</li> * </ol> diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/Framework.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/Framework.java index e76240d5d..2b14cb8f7 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/Framework.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/Framework.java @@ -328,6 +328,20 @@ public interface Framework extends Bundle { URL getEntry(String path); /** + * Returns the time when the most recently modified bundle in this framework + * was last modified. A bundle is considered to be modified when it is + * installed, updated or uninstalled. + * + * <p> + * The time value is the number of milliseconds since January 1, 1970, + * 00:00:00 UTC. + * + * @return The time when the most recently modified bundle in this framework + * was last modified. + */ + long getLastModified(); + + /** * Returns {@code null} as a framework implementation does not have a proper * bundle from which to return entries. * diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/FrameworkStartLevel.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/FrameworkStartLevel.java index 12c6f6084..155604dee 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/FrameworkStartLevel.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/FrameworkStartLevel.java @@ -69,13 +69,13 @@ public interface FrameworkStartLevel extends BundleReference { * At each intermediate start level value on the way to and including the * target start level, the Framework must: * <ol> - * <li>Change the active start level to the intermediate start level value. + * <li>Change the active start level to the intermediate start level value.</li> * <li>Start bundles at the intermediate start level whose autostart setting * indicate they must be started. They are started as described in the * {@link Bundle#start(int)} method using the {@link Bundle#START_TRANSIENT} * option. The {@link Bundle#START_ACTIVATION_POLICY} option must also be * used if {@link BundleStartLevel#isActivationPolicyUsed()} returns - * {@code true} for the bundle. + * {@code true} for the bundle.</li> * </ol> * When this process completes after the specified start level is reached, * the Framework will fire a Framework event of type @@ -92,8 +92,8 @@ public interface FrameworkStartLevel extends BundleReference { * <ol> * <li>Stop bundles at the intermediate start level as described in the * {@link Bundle#stop(int)} method using the {@link Bundle#STOP_TRANSIENT} - * option. - * <li>Change the active start level to the intermediate start level value. + * option.</li> + * <li>Change the active start level to the intermediate start level value.</li> * </ol> * When this process completes after the specified start level is reached, * the Framework will fire a Framework event of type diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevision.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevision.java index e68e01a67..1748fbbba 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevision.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevision.java @@ -235,7 +235,7 @@ public interface BundleRevision extends BundleReference, Resource { * Returns the special types of this bundle revision. The bundle revision * type values are: * <ul> - * <li>{@link #TYPE_FRAGMENT} + * <li>{@link #TYPE_FRAGMENT}</li> * </ul> * * A bundle revision may be more than one type at a time. A type code is diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWiring.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWiring.java index a3b3fd7ad..04103f9fd 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWiring.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWiring.java @@ -302,9 +302,9 @@ public interface BundleWiring extends BundleReference, Wiring { * <li>Only the resource names for resources in bundle wirings will be * returned. The names of resources visible to a bundle wiring's parent * class loader, such as the bootstrap class loader, must not be included in - * the result. + * the result.</li> * <li>Only established wires will be examined for resources. This method - * must not cause new wires for dynamic imports to be established. + * must not cause new wires for dynamic imports to be established.</li> * </ul> * * @param path The path name in which to look. The path is always relative diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/FrameworkWiring.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/FrameworkWiring.java index bff4cdf85..54742f47d 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/FrameworkWiring.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/FrameworkWiring.java @@ -53,27 +53,23 @@ public interface FrameworkWiring extends BundleReference { * <li>Compute the {@link #getDependencyClosure(Collection) dependency * closure} of the specified bundles. If no bundles are specified, compute * the dependency closure of the {@link #getRemovalPendingBundles() removal - * pending} bundles. - * + * pending} bundles.</li> * <li>Each bundle in the dependency closure that is in the {@code ACTIVE} - * state will be stopped as described in the {@code Bundle.stop} method. - * + * state will be stopped as described in the {@code Bundle.stop} method.</li> * <li>Each bundle in the dependency closure that is in the {@code RESOLVED} * state is unresolved and thus moved to the {@code INSTALLED} state. The * effect of this step is that bundles in the dependency closure are no - * longer {@code RESOLVED}. - * + * longer {@code RESOLVED}.</li> * <li>Each bundle in the dependency closure that is in the * {@code UNINSTALLED} state is removed from the dependency closure and is - * now completely removed from the Framework. - * + * now completely removed from the Framework.</li> * <li>Each bundle in the dependency closure that was in the {@code ACTIVE} * state prior to Step 2 is started as described in the {@code Bundle.start} * method, causing all bundles required for the restart to be resolved. It * is possible that, as a result of the previous steps, packages that were * previously exported no longer are. Therefore, some bundles may be * unresolvable until bundles satisfying the dependencies have been - * installed in the Framework. + * installed in the Framework.</li> * </ol> * * <p> diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/Condition.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/Condition.java index ae2500276..de6749fad 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/Condition.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/Condition.java @@ -45,7 +45,8 @@ public interface Condition { * is immutable), then this Condition must be able to directly answer the * {@link #isSatisfied()} method. In other words, isSatisfied() will return * very quickly since no external sources, such as for example users or - * networks, need to be consulted. <br/> + * networks, need to be consulted. + * <p> * This method must always return the same value whenever it is called so * that the Conditional Permission Admin can cache its result. * diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionInfo.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionInfo.java index c2497fefb..7515b936f 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionInfo.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionInfo.java @@ -41,7 +41,7 @@ import java.util.List; * </li> * <li>Implement the {@code Condition} interface and define a public constructor * that takes a {@code Bundle} object and a {@code ConditionInfo} object as - * arguments. + * arguments.</li> * </ul> * * @Immutable @@ -171,9 +171,9 @@ public class ConditionInfo { * </pre> * * where <i>argN</i> are strings that must be encoded for proper parsing. - * Specifically, the {@code "}, {@code \}, carriage return, and line - * feed characters must be escaped using {@code \"}, {@code \\}, - * {@code \r}, and {@code \n}, respectively. + * Specifically, the {@code "}, {@code \}, carriage return, and line feed + * characters must be escaped using {@code \"}, {@code \\}, {@code \r}, and + * {@code \n}, respectively. * * <p> * The encoded string contains no leading or trailing whitespace characters. diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java index c4222b04d..0d9197ccc 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java @@ -132,11 +132,10 @@ public interface ConditionalPermissionInfo { * * <p> * <i>name</i> is optional. If <i>name</i> is present in the encoded string, - * it must quoted, beginning and ending with {@code "}. The <i>name</i> - * value must be encoded for proper parsing. Specifically, the - * {@code "}, {@code \}, carriage return, and line feed characters must - * be escaped using {@code \"}, {@code \\}, {@code \r}, and {@code \n}, - * respectively. + * it must quoted, beginning and ending with {@code "}. The <i>name</i> + * value must be encoded for proper parsing. Specifically, the {@code "}, + * {@code \}, carriage return, and line feed characters must be escaped + * using {@code \"}, {@code \\}, {@code \r}, and {@code \n}, respectively. * * <p> * The encoded string contains no leading or trailing whitespace characters. diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/permissionadmin/PermissionInfo.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/permissionadmin/PermissionInfo.java index d904a01a7..8b9d85da1 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/permissionadmin/PermissionInfo.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/permissionadmin/PermissionInfo.java @@ -217,9 +217,9 @@ public class PermissionInfo { * </pre> * * where <i>name</i> and <i>actions</i> are strings that must be encoded for - * proper parsing. Specifically, the {@code "},{@code \}, carriage - * return, and line feed characters must be escaped using {@code \"}, - * {@code \\},{@code \r}, and {@code \n}, respectively. + * proper parsing. Specifically, the {@code "},{@code \}, carriage return, + * and line feed characters must be escaped using {@code \"}, {@code \\}, + * {@code \r}, and {@code \n}, respectively. * * <p> * The encoded string contains no leading or trailing whitespace characters. diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/package-info.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/package-info.java index db1706d83..61f84b528 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/package-info.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/package-info.java @@ -32,7 +32,8 @@ * <p> * {@code Import-Package: org.osgi.service.resolver; version="[1.0,1.1)"} * - * @version $Id$ + * @version 1.0 + * @author $Id$ */ package org.osgi.service.resolver; diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/startlevel/StartLevel.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/startlevel/StartLevel.java index ec0295bdf..6d17f1451 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/startlevel/StartLevel.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/startlevel/StartLevel.java @@ -100,14 +100,13 @@ public interface StartLevel { * At each intermediate start level value on the way to and including the * target start level, the Framework must: * <ol> - * <li>Change the active start level to the intermediate start level value. - * <li>Start bundles at the intermediate start level whose autostart - * setting indicate they must be started. They are started as described in - * the {@link Bundle#start(int)} method using the - * {@link Bundle#START_TRANSIENT} option. The - * {@link Bundle#START_ACTIVATION_POLICY} option must also be used if - * {@link #isBundleActivationPolicyUsed(Bundle)} returns {@code true} - * for the bundle. + * <li>Change the active start level to the intermediate start level value.</li> + * <li>Start bundles at the intermediate start level whose autostart setting + * indicate they must be started. They are started as described in the + * {@link Bundle#start(int)} method using the {@link Bundle#START_TRANSIENT} + * option. The {@link Bundle#START_ACTIVATION_POLICY} option must also be + * used if {@link #isBundleActivationPolicyUsed(Bundle)} returns + * {@code true} for the bundle.</li> * </ol> * When this process completes after the specified start level is reached, * the Framework will fire a Framework event of type @@ -124,8 +123,8 @@ public interface StartLevel { * <ol> * <li>Stop bundles at the intermediate start level as described in the * {@link Bundle#stop(int)} method using the {@link Bundle#STOP_TRANSIENT} - * option. - * <li>Change the active start level to the intermediate start level value. + * option.</li> + * <li>Change the active start level to the intermediate start level value.</li> * </ol> * When this process completes after the specified start level is reached, * the Framework will fire a Framework event of type |