sync with latest osgi javadoc.v20110228

6 files changed, 19 insertions, 19 deletions

diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java
index 3114bab5c..c49f0acfa 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * 
  * @ThreadSafe
  * @noimplement
- * @version $Id: BundleCapability.java,v 1.1.2.1 2011/02/14 22:18:14 twatson Exp $
+ * @version $Id: 0fde13c3228af1aa97872b37ccf0aa6e23123b11 $
  */
 public interface BundleCapability {
 	/**
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRequirement.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRequirement.java
index 4ec2b12b4..bd637e618 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRequirement.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRequirement.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * 
  * @ThreadSafe
  * @noimplement
- * @version $Id: BundleRequirement.java,v 1.1.2.1 2011/02/14 22:18:14 twatson Exp $
+ * @version $Id: 659132c1fac7526240df377ead0e1bc8d4af2e77 $
  */
 public interface BundleRequirement {
 	/**
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 4f8ccca94..5924dc1fe 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
@@ -47,7 +47,7 @@ import org.osgi.framework.Version;
  * 
  * @ThreadSafe
  * @noimplement
- * @version $Id: 5c029f6074388be25b42893e72012b4bbbc96fce $
+ * @version $Id: 139b3046ebd46c48b03dda8d36f2f9d79e2e616d $
  */
 public interface BundleRevision extends BundleReference {
 	/**
@@ -101,7 +101,7 @@ public interface BundleRevision extends BundleReference {
 	 * 
 	 * <p>
 	 * The name of the package is stored in the capability attribute of the same
-	 * name as this name space ({@value #PACKAGE_NAMESPACE}). The other
+	 * name as this name space (osgi.wiring.package). The other
 	 * directives and attributes of the package, from the
 	 * {@link Constants#EXPORT_PACKAGE Export-Package} manifest header, can be
 	 * found in the cabability's {@link BundleCapability#getDirectives()
@@ -144,8 +144,8 @@ public interface BundleRevision extends BundleReference {
 	 * 
 	 * <p>
 	 * The bundle symbolic name of the bundle is stored in the capability
-	 * attribute of the same name as this name space ({@value #BUNDLE_NAMESPACE}
-	 * ). The other directives and attributes of the bundle, from the
+	 * attribute of the same name as this name space (osgi.wiring.bundle).
+	 * The other directives and attributes of the bundle, from the
 	 * {@link Constants#BUNDLE_SYMBOLICNAME Bundle-SymbolicName} manifest
 	 * header, can be found in the cabability's
 	 * {@link BundleCapability#getDirectives() directives} and
@@ -182,7 +182,7 @@ public interface BundleRevision extends BundleReference {
 	 * 
 	 * <p>
 	 * The bundle symbolic name of the bundle is stored in the capability
-	 * attribute of the same name as this name space ({@value #HOST_NAMESPACE}).
+	 * attribute of the same name as this name space (osgi.wiring.host).
 	 * The other directives and attributes of the bundle, from the
 	 * {@link Constants#BUNDLE_SYMBOLICNAME Bundle-SymbolicName} manifest
 	 * header, can be found in the cabability's
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevisions.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevisions.java
index ba856b3f3..a619dbb7c 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevisions.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevisions.java
@@ -38,7 +38,7 @@ import org.osgi.framework.BundleReference;
  * 
  * @ThreadSafe
  * @noimplement
- * @version $Id: BundleRevisions.java,v 1.1.2.2 2011/02/14 22:18:14 twatson Exp $
+ * @version $Id: 1d95ad10f0f08b100f8ee2485bdd34120032c7af $
  */
 public interface BundleRevisions extends BundleReference {
 	/**
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java
index ad420fa60..1b19e4cbc 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java
@@ -21,7 +21,7 @@ package org.osgi.framework.wiring;
  * 
  * @ThreadSafe
  * @noimplement
- * @version $Id: BundleWire.java,v 1.1.2.1 2011/02/14 22:18:14 twatson Exp $
+ * @version $Id: 4f936a84065762ec3267a44f86ae01b0150e44ce $
  */
 public interface BundleWire {
 	/**
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 c8f19a270..8d8956a18 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
@@ -47,7 +47,7 @@ import org.osgi.framework.BundleReference;
  * 
  * @ThreadSafe
  * @noimplement
- * @version $Id: 7a7bc5a26838599519fbd1496248136278b9d1e7 $
+ * @version $Id: 58b8ec3bb9649387d4ccba1070f034f217d06ea2 $
  */
 public interface BundleWiring extends BundleReference {
 	/**
@@ -238,12 +238,12 @@ public interface BundleWiring extends BundleReference {
 	 *        {@link #FINDENTRIES_RECURSE}. The method must ignore unrecognized
 	 *        options.
 	 * @return An unmodifiable list of URL objects for each matching entry, or
-	 *         an empty list if no matching entry could not be found, if this
-	 *         bundle wiring is for a fragment revision or if the caller does
-	 *         not have the appropriate {@code AdminPermission[bundle,RESOURCE]}
-	 *         and the Java Runtime Environment supports permissions. The list
-	 *         is ordered such that entries from the {@link #getRevision()
-	 *         bundle revision} are returned first followed by the entries from
+	 *         an empty list if no matching entry could be found, if this bundle
+	 *         wiring is for a fragment revision or if the caller does not have
+	 *         the appropriate {@code AdminPermission[bundle,RESOURCE]} and the
+	 *         Java Runtime Environment supports permissions. The list is
+	 *         ordered such that entries from the {@link #getRevision() bundle
+	 *         revision} are returned first followed by the entries from
 	 *         attached fragment revisions in attachment order. If this bundle
 	 *         wiring is not {@link #isInUse() in use}, {@code null} must be
 	 *         returned.
@@ -295,9 +295,9 @@ public interface BundleWiring extends BundleReference {
 	 *        {@link #LISTRESOURCES_LOCAL} and {@link #LISTRESOURCES_RECURSE}.
 	 *        This method must ignore unrecognized options.
 	 * @return An unmodifiable collection of resource names for each matching
-	 *         resource, or an empty collection if no matching resource could
-	 *         not be found, if this bundle wiring is for a fragment revision or
-	 *         if the caller does not have the appropriate
+	 *         resource, or an empty collection if no matching resource could be
+	 *         found, if this bundle wiring is for a fragment revision or if the
+	 *         caller does not have the appropriate
 	 *         {@code AdminPermission[bundle,RESOURCE]} and the Java Runtime
 	 *         Environment supports permissions. The collection is unordered and
 	 *         must contain no duplicate resource names. If this bundle wiring