osgi: Update to latest APII20140204-0800

Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>

8 files changed, 41 insertions, 25 deletions

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 62bcb7917..9d2721473 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
@@ -849,10 +849,13 @@ public interface BundleContext extends BundleReference {
 	 * the specified {@code ServiceReference} object.
 	 * 
 	 * <p>
-	 * The {@link ServiceObjects} object can be used to obtain multiple
-	 * service objects for services with {@link Constants#SCOPE_PROTOTYPE
-	 * prototype} scope. For services with {@link Constants#SCOPE_SINGLETON
-	 * singleton} or {@link Constants#SCOPE_BUNDLE bundle} scope, the
+	 * The {@link ServiceObjects} object can be used to obtain multiple service
+	 * objects for services with {@link Constants#SCOPE_PROTOTYPE prototype}
+	 * scope.
+	 * 
+	 * <p>
+	 * For services with {@link Constants#SCOPE_SINGLETON singleton} or
+	 * {@link Constants#SCOPE_BUNDLE bundle} scope, the
 	 * {@link ServiceObjects#getService()} method behaves the same as the
 	 * {@link #getService(ServiceReference)} method and the
 	 * {@link ServiceObjects#ungetService(Object)} method behaves the same as
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java
index bebcb5abc..83b8d5021 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2000, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2014). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -809,6 +809,9 @@ public interface Constants {
 	 *     Fragment-Host: system.bundle; extension:=&quot;framework&quot;
 	 * </pre>
 	 * 
+	 * <p>
+	 * The default value is {@link #EXTENSION_FRAMEWORK framework}.
+	 * 
 	 * @see #FRAGMENT_HOST
 	 * @see #EXTENSION_FRAMEWORK
 	 * @see #EXTENSION_BOOTCLASSPATH
@@ -1383,7 +1386,7 @@ public interface Constants {
 
 	/**
 	 * Service scope is bundle. Each bundle using the service receives a
-	 * distinct service object.
+	 * customized service object.
 	 * 
 	 * @since 1.8
 	 * @see #SERVICE_SCOPE
@@ -1392,7 +1395,7 @@ public interface Constants {
 
 	/**
 	 * Service scope is prototype. Each bundle using the service receives either
-	 * a distinct service object or can request multiple distinct service
+	 * a customized service object or can request multiple customized service
 	 * objects via {@link ServiceObjects}.
 	 * 
 	 * @since 1.8
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceException.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceException.java
index 98f0a687b..32a515460 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceException.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2007, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2007, 2014). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,6 +74,12 @@ public class ServiceException extends RuntimeException {
 	 * @since 1.6
 	 */
 	public static final int	FACTORY_RECURSION	= 6;
+	/**
+	 * An asynchronous operation was unable to obtain the service.
+	 * 
+	 * @since 1.8
+	 */
+	public static final int	ASYNC_ERROR			= 7;
 
 	/**
 	 * Creates a {@code ServiceException} with the specified message and
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceObjects.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceObjects.java
index e2f8df48f..99314fe28 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceObjects.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceObjects.java
@@ -25,7 +25,8 @@ import org.osgi.annotation.versioning.ProviderType;
  * For services with {@link Constants#SCOPE_PROTOTYPE prototype} scope, multiple
  * service objects for the service can be obtained. For services with
  * {@link Constants#SCOPE_SINGLETON singleton} or {@link Constants#SCOPE_BUNDLE
- * bundle} scope, only one, use-counted service object is available.
+ * bundle} scope, only one, use-counted service object is available to a
+ * requesting bundle.
  * 
  * <p>
  * Any unreleased service objects obtained from this {@code ServiceObjects}
@@ -49,12 +50,14 @@ public interface ServiceObjects<S> {
 	 * <p>
 	 * This {@code ServiceObjects} object can be used to obtain multiple service
 	 * objects for the associated service if the service has
-	 * {@link Constants#SCOPE_PROTOTYPE prototype} scope. If the associated
-	 * service has {@link Constants#SCOPE_SINGLETON singleton} or
-	 * {@link Constants#SCOPE_BUNDLE bundle} scope, this method behaves the same
-	 * as calling the {@link BundleContext#getService(ServiceReference)} method
-	 * for the associated service. That is, only one, use-counted service object
-	 * is available from this {@link ServiceObjects} object.
+	 * {@link Constants#SCOPE_PROTOTYPE prototype} scope.
+	 * 
+	 * <p>
+	 * If the associated service has {@link Constants#SCOPE_SINGLETON singleton}
+	 * or {@link Constants#SCOPE_BUNDLE bundle} scope, this method behaves the
+	 * same as calling the {@link BundleContext#getService(ServiceReference)}
+	 * method for the associated service. That is, only one, use-counted service
+	 * object is available from this {@link ServiceObjects} object.
 	 * 
 	 * <p>
 	 * This method will always return {@code null} when the associated service
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 7feb9d730..5f0450b46 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2000, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2014). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,9 +53,10 @@ public interface ServiceRegistration<S> {
 	 * Updates the properties associated with a service.
 	 * 
 	 * <p>
-	 * The {@link Constants#OBJECTCLASS} and {@link Constants#SERVICE_ID} keys
-	 * cannot be modified by this method. These values are set by the Framework
-	 * when the service is registered in the OSGi environment.
+	 * The {@link Constants#OBJECTCLASS}, {@link Constants#SERVICE_ID} and
+	 * {@link Constants#SERVICE_SCOPE} keys cannot be modified by this method.
+	 * These values are set by the Framework when the service is registered in
+	 * the OSGi environment.
 	 * 
 	 * <p>
 	 * The following steps are required to modify service properties:
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Version.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Version.java
index 75f12aab0..c24d4d37a 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Version.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Version.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2004, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2004, 2014). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -237,7 +237,7 @@ public class Version implements Comparable<Version> {
 	 * 
 	 * <p>
 	 * This method performs a similar function as {@link #parseVersion(String)}
-	 * but uses the static factory {@code valueOf(String)} method signature.
+	 * but has the static factory {@code valueOf(String)} method signature.
 	 * 
 	 * @param version String representation of the version identifier. Leading
 	 *        and trailing whitespace will be ignored. Must not be {@code null}.
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/weaving/WovenClassListener.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/weaving/WovenClassListener.java
index d8230835b..4a7a69943 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/weaving/WovenClassListener.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/weaving/WovenClassListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2012, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2014). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@ package org.osgi.framework.hooks.weaving;
 import org.osgi.annotation.versioning.ConsumerType;
 
 /**
- * OSGi Framework Woven Class Listener Service.
+ * Woven Class Listener Service.
  * 
  * <p>
  * Bundles registering this service will receive notifications whenever a
  * {@link WovenClass woven class} completes a {@link WovenClass#getState()
- * state} transition. Implementers will therefore be unable to modify the woven
+ * state} transition. Woven Class Listeners are not able to modify the woven
  * class in contrast with {@link WeavingHook weaving hooks}.
  * 
  * <p>
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java
index 993cb4ace..a7cbf04c3 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java
@@ -132,7 +132,7 @@ public final class HostNamespace extends AbstractWiringNamespace {
 
 	/**
 	 * The requirement directive used to specify the type of the extension
-	 * fragment.
+	 * fragment. The default value is {@link #EXTENSION_FRAMEWORK framework}.
 	 * 
 	 * @see #EXTENSION_FRAMEWORK
 	 * @see #EXTENSION_BOOTCLASSPATH