diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java index 2804bb610a7..55caddb0750 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java @@ -23,15 +23,17 @@ * with roles. Before granting access to a restricted resource or operation, a * bundle will check if the Authorization object passed to it possesses the * required role, by calling its hasRole method. + *
** Authorization contexts are instantiated by calling * {@link UserAdmin#getAuthorization} - *
+ *
** There are no restrictions regarding the creation of Authorization objects. * Hence, a service must only accept Authorization objects from bundles that has * been authorized to use the service using code based (or Java 2) permissions. + *
** In some cases it is useful to use ServicePermissions to do the code based * access control. A service basing user access control on Authorization objects @@ -39,14 +41,16 @@ * ServicePermission to get the service in question. This is the most convenient * way. The framework will do the code based permission check when the calling * bundle attempts to get the service from the service registry. + *
** Example: A servlet using a service on a user's behalf. The bundle with the * servlet must be given the ServicePermission to get the Service. + *
** However, in some cases the code based permission checks need to be more * fine-grained. A service might allow all bundles to get it, but require * certain code based permissions for some of its methods. - *
+ *
* Example: A servlet using a service on a user's behalf, where some service * functionality is open to anyone, and some is restricted by code based * permissions. When a restricted method is called (e.g., one handing over an diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java index 3cb4a60c121..c299e323086 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java @@ -67,7 +67,7 @@ public class FrameworkDebugOptions private Properties disabledOptions = null; /** * A cache of all of the bundlesDebugTrace
in the format
- * - *+ *
*
* - *Property Value Type *Comparison Type @@ -121,7 +121,7 @@ *String *String comparison *+ * * diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java index d35e8f7856e..1be3f59208f 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java @@ -103,25 +103,21 @@ public HookRegistry(EquinoxContainer container) { /** * Initializes the hook configurators. The following steps are used to * initialize the hook configurators. - *Integer, Long, Float, Double, Byte, Short, BigInteger, BigDecimal *numerical comparison *- * 1. Get a list of hook configurators from all hook configurators properties + *
+ *
*/ public void initialize() { List- Get a list of hook configurators from all hook configurators properties * files on the classpath, add this list to the overall list of hook - * configurators, remove duplicates. - *
+ *- * 2. Get a list of hook configurators from the + * configurators, remove duplicates.
- Get a list of hook configurators from the * ("osgi.hook.configurators.include") system property and add this - * list to the overall list of hook configurators, remove duplicates. - *
+ *- * 3. Get a list of hook configurators from the + * list to the overall list of hook configurators, remove duplicates.
- Get a list of hook configurators from the * ("osgi.hook.configurators.exclude") system property and remove this - * list from the overall list of hook configurators. - *
+ *- * 4. Load each hook configurator class, create a new instance, then call the - * {@link HookConfigurator#addHooks(HookRegistry)} method - *
- * 5. Set this HookRegistry object to read only to prevent any other hooks from - * being added. - *
+ * list from the overall list of hook configurators.
- Load each hook configurator class, create a new instance, then call the + * {@link HookConfigurator#addHooks(HookRegistry)} method
+ *- Set this HookRegistry object to read only to prevent any other hooks from + * being added.
+ *configurators = new ArrayList<>(5); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java index dd471ace210..99ffb6dcd3e 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java @@ -33,7 +33,6 @@ * A StorageHookFactory hooks into the persistent storage loading and saving of * bundle {@link Generation generations}. A factory creates StorageHook * instances that get associated with each Generation object installed. - * * * @see Generation#getStorageHook(Class) * @param
the save context type diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java index fafd5a36453..d73531c18c2 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java @@ -41,8 +41,9 @@ public abstract class MultiplexingFactory { /** * As a short-term (hopefully) solution we use a special class which is defined * using the Unsafe class from the VM. This class is an implementation of - * Collectionsimply to provide a method add(AccessibleObject) - * which turns around and calls AccessibleObject.setAccessible(true). + * {@code Collection } simply to provide a method + * add(AccessibleObject) which turns around and calls + * AccessibleObject.setAccessible(true). * * The reason this is needed is to hack into the VM to get deep reflective * access to the java.net package for the various hacks we have to do to