Bug 227409 Convert org.eclipse.osgi to use api tooling

46 files changed, 101 insertions, 93 deletions

diff --git a/bundles/org.eclipse.osgi/.project b/bundles/org.eclipse.osgi/.project
index 337f99e56..eb75f221f 100644
--- a/bundles/org.eclipse.osgi/.project
+++ b/bundles/org.eclipse.osgi/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/bundles/org.eclipse.osgi/component.xml b/bundles/org.eclipse.osgi/component.xml
deleted file mode 100644
index 25f952992..000000000
--- a/bundles/org.eclipse.osgi/component.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/component"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://eclipse.org/component ../component.xsd "
-   name="Eclipse OSGi Framework">
-   <component-depends unrestricted="true"/>
-
- <plugin id="org.eclipse.osgi" />
- <plugin id="org.eclipse.osgi.services" />
- <plugin id="org.eclipse.osgi.util" />
-
- <package name="org.eclipse.osgi.util">
-   <type name="ManifestElement" subclass="false" />
- </package>
- <package name="org.eclipse.osgi.service.datalocation">
-   <type name="Location" implement="false" />
- </package>
-
- <package name="org.osgi.framework">
-   <type name="Bundle" implement="false"/>
-   <type name="BundleContext" implement="false"/>
-   <type name="BundleEvent" subclass="false"/>
-   <type name="Filter" implement="false"/>
-   <type name="FrameworkEvent" subclass="false"/>
-   <type name="ServiceEvent" subclass="false"/>
-   <type name="ServiceReference" implement="false"/>
-   <type name="ServiceRegistration" implement="false"/>
-   <type name="Version" subclass="false"/>
- </package>
- <package name="org.osgi.service.condpermadmin">
-   <type name="BundleLocationCondition" instantiate="false"/>
-   <type name="BundleSignerCondition" instantiate="false"/>
-   <type name="ConditionalPermissionAdmin" implement="false"/>
-   <type name="ConditionalPermissionInfo" implement="false"/>
-   <type name="ConditionInfo" subclass="false"/>
- </package>
- <package name="org.osgi.service.packageadmin">
-   <type name="ExportedPackage" implement="false"/>
-   <type name="PackageAdmin" implement="false"/>
-   <type name="RequiredBundle" implement="false"/>
- </package>
- <package name="org.osgi.service.permissionadmin">
-   <type name="PermissionAdmin" implement="false"/>
-   <type name="PermissionInfo" subclass="false"/>
- </package>
- <package name="org.osgi.service.startlevel">
-   <type name="StartLevel" implement="false"/>
- </package>
- <package name="org.osgi.service.url">
-   <type name="URLStreamHandlerSetter" implement="false"/>
- </package>
- <package name="org.osgi.util.tracker"/>
- 
- <package name="org.osgi.service.cm"/>
- <package name="org.osgi.service.device"/>
- <package name="org.osgi.service.http"/>
- <package name="org.osgi.service.io"/>
- <package name="org.osgi.service.log"/>
- <package name="org.osgi.service.metatype"/>
- <package name="org.osgi.service.provisioning"/>
- <package name="org.osgi.service.upnp"/>
- <package name="org.osgi.service.useradmin"/>
- <package name="org.osgi.service.wireadmin"/>
-
- <package name="org.osgi.util.measurement"/>
- <package name="org.osgi.util.position"/>
- <package name="org.osgi.util.xml"/>
-
-</component>
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BaseDescription.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BaseDescription.java
index 05da201c7..50b1078e3 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BaseDescription.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BaseDescription.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,6 +20,7 @@ import org.osgi.framework.Version;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface BaseDescription {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDelta.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDelta.java
index 124458e48..74e7931b2 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDelta.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDelta.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ package org.eclipse.osgi.service.resolver;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface BundleDelta extends Comparable {
 
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDescription.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDescription.java
index 7952acd00..8cfb2701f 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDescription.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleDescription.java
@@ -17,6 +17,7 @@ package org.eclipse.osgi.service.resolver;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface BundleDescription extends BaseDescription {
 
@@ -234,6 +235,7 @@ public interface BundleDescription extends BaseDescription {
 	 *  of <code>null</code> is returned if there is no native code
 	 *  specification.
 	 * @return the native code specification.
+	 * @since 3.4
 	 */
 	public NativeCodeSpecification getNativeCodeSpecification();
 
@@ -243,6 +245,7 @@ public interface BundleDescription extends BaseDescription {
 	 * or the bundle does not have substituted exports then an empty array is
 	 * returned.
 	 * @return all substituted exports for this bundle description
+	 * @since 3.4
 	 */
 	public ExportPackageDescription[] getSubstitutedExports();
 }
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleSpecification.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleSpecification.java
index 758aab412..bb5d4ac23 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleSpecification.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/BundleSpecification.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ package org.eclipse.osgi.service.resolver;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface BundleSpecification extends VersionConstraint {
 
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/DisabledInfo.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/DisabledInfo.java
index dbe1274a3..30dcfdda1 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/DisabledInfo.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/DisabledInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -22,6 +22,7 @@ package org.eclipse.osgi.service.resolver;
  * must be added to the state.
  * </p>
  *@see State
+ *@noextend This class is not intended to be subclassed by clients.
  */
 public final class DisabledInfo {
 	private final String policyName;
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ExportPackageDescription.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ExportPackageDescription.java
index 789aac403..cb9a8397a 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ExportPackageDescription.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ExportPackageDescription.java
@@ -19,6 +19,7 @@ import java.util.Map;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ExportPackageDescription extends BaseDescription {
 
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericDescription.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericDescription.java
index 39e5de970..33c27bf24 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericDescription.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericDescription.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,6 +15,7 @@ import java.util.Dictionary;
 /**
  * A description of a generic capability.
  * @since 3.2
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface GenericDescription extends BaseDescription {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericSpecification.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericSpecification.java
index 4b0a12d5b..3ebc34a54 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericSpecification.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/GenericSpecification.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@ package org.eclipse.osgi.service.resolver;
 /**
  * A specification which depends on a generic capability
  * @since 3.2
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface GenericSpecification extends VersionConstraint {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/HostSpecification.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/HostSpecification.java
index 3e4c05d1c..3f6a46fe7 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/HostSpecification.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/HostSpecification.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ package org.eclipse.osgi.service.resolver;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface HostSpecification extends VersionConstraint {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java
index d91b43b1a..8e128464f 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ImportPackageSpecification.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,6 +20,7 @@ import java.util.Map;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ImportPackageSpecification extends VersionConstraint {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeDescription.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeDescription.java
index 157ccdb12..854aa808f 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeDescription.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeDescription.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ import org.osgi.framework.Filter;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.4
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface NativeCodeDescription extends BaseDescription, Comparable {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeSpecification.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeSpecification.java
index ef667fe2a..1c37fd3e0 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeSpecification.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/NativeCodeSpecification.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@ package org.eclipse.osgi.service.resolver;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.4
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface NativeCodeSpecification extends VersionConstraint {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/PlatformAdmin.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/PlatformAdmin.java
index 8b2911af9..79a17c206 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/PlatformAdmin.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/PlatformAdmin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import org.osgi.framework.BundleException;
  * This interface is not intended to be implemented by clients.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface PlatformAdmin {
 
@@ -97,12 +98,14 @@ public interface PlatformAdmin {
 	 * @param disabledInfo the disabled info to add.
 	 * @throws IllegalArgumentException if the <code>BundleDescription</code> for
 	 * the specified disabled info does not exist in the state managed by this platform admin.
+	 * @since 3.4
 	 */
 	public void addDisabledInfo(DisabledInfo disabledInfo);
 
 	/**
 	 * Removes the disabled info from the state managed by this platform admin.
 	 * @param disabledInfo the disabled info to remove
+	 * @since 3.4
 	 */
 	public void removeDisabledInfo(DisabledInfo disabledInfo);
 }
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ResolverError.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ResolverError.java
index 1fb04a68e..ea7ae4bf9 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ResolverError.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/ResolverError.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@ package org.eclipse.osgi.service.resolver;
  * This interface is not intended to be implemented by clients.
  * </p>
  * @since 3.2
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ResolverError {
 	/**
@@ -127,18 +128,21 @@ public interface ResolverError {
 	/**
 	 * Error type constant (bit mask) indicating that a bundle could not be
 	 * resolved because no match was found for the  native code specification.
+	 * @since 3.4
 	 */
 	public static final int NO_NATIVECODE_MATCH = 0x10000;
 
 	/**
 	 * Error type constant (bit mask) indicating that a bundle could not be
 	 * resolved because the matching native code paths are invalid.
+	 * @since 3.4
 	 */
 	public static final int INVALID_NATIVECODE_PATHS = 0x20000;
 
 	/**
 	 * Error type constant (bit mask) indicating that a bundle could not be
 	 * resolved because the bundle was disabled
+	 * @since 3.4
 	 */
 	public static final int DISABLED_BUNDLE = 0x40000;
 
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/State.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/State.java
index 2fb96de0c..56c42ca95 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/State.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/State.java
@@ -23,6 +23,7 @@ import org.osgi.framework.Version;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface State {
 	/**
@@ -206,6 +207,7 @@ public interface State {
 	 * @param resolvedRequires the BundleDescriptions that resolve the required bundles for this bundle, can be <code>null</code>
 	 * @param resolvedImports the exported packages that resolve the imports for this bundle, can be <code>null</code>
 	 * @throws IllegalStateException if this is not done during a call to <code>resolve</code>
+	 * @since 3.4
 	 */
 	public void resolveBundle(BundleDescription bundle, boolean status, BundleDescription[] hosts, ExportPackageDescription[] selectedExports, ExportPackageDescription[] substitutedExports, BundleDescription[] resolvedRequires, ExportPackageDescription[] resolvedImports);
 
@@ -490,6 +492,7 @@ public interface State {
 	 * </p>
 	 * @param nativeCodeDescription the native code description.
 	 * @param hasInvalidNativePaths true if the native code paths are invalid; false otherwise.
+	 * @since 3.4
 	 */
 	public void setNativePathsInvalid(NativeCodeDescription nativeCodeDescription, boolean hasInvalidNativePaths);
 
@@ -499,6 +502,7 @@ public interface State {
 	 * each bundle is disabled.
 	 * @return the array of disabled bundles.  An empty array is returned if no bundles are disabled.
 	 * @see DisabledInfo
+	 * @since 3.4
 	 */
 	public BundleDescription[] getDisabledBundles();
 
@@ -509,12 +513,14 @@ public interface State {
 	 * @param disabledInfo the disabled info to add.
 	 * @throws IllegalArgumentException if the <code>BundleDescription</code> for
 	 * the specified disabled info does not exist in this state.
+	 * @since 3.4
 	 */
 	public void addDisabledInfo(DisabledInfo disabledInfo);
 
 	/**
 	 * Removes the disabled info from the state.
 	 * @param disabledInfo the disabled info to remove
+	 * @since 3.4
 	 */
 	public void removeDisabledInfo(DisabledInfo disabledInfo);
 
@@ -523,6 +529,7 @@ public interface State {
 	 * then an empty array is returned.
 	 * @param bundle the bundle to get the disabled info for.
 	 * @return the array of disabled info.
+	 * @since 3.4
 	 */
 	public DisabledInfo[] getDisabledInfos(BundleDescription bundle);
 
@@ -531,6 +538,7 @@ public interface State {
 	 * If no disabled info exists then <code>null</code> is returned.
 	 * @param bundle the bundle to get the disabled info for
 	 * @return the disabled info.
+	 * @since 3.4
 	 */
 	public DisabledInfo getDisabledInfo(BundleDescription bundle, String policyName);
 }
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateDelta.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateDelta.java
index 1f1783513..ab6dfcb50 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateDelta.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateDelta.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@ package org.eclipse.osgi.service.resolver;
  * This interface is not intended to be implemented by clients.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface StateDelta {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateHelper.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateHelper.java
index 87e6dbddc..0f10cb492 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateHelper.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ package org.eclipse.osgi.service.resolver;
  * </p>
  * @since 3.1
  * @see PlatformAdmin#getStateHelper
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface StateHelper {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateObjectFactory.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateObjectFactory.java
index ccf22b2c4..3499de77f 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateObjectFactory.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/StateObjectFactory.java
@@ -22,6 +22,7 @@ import org.osgi.framework.*;
  * This interface is not intended to be implemented by clients.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface StateObjectFactory {
 
@@ -154,6 +155,7 @@ public interface StateObjectFactory {
 	 * @param genericCapabilities the specifications of all the capabilities of the bundle (may be <code>null</code>)
 	 * @param nativeCode the native code specification of the bundle (may be <code>null</code>)
 	 * @return the created bundle description
+	 * @since 3.4
 	 */
 	public BundleDescription createBundleDescription(long id, String symbolicName, Version version, String location, BundleSpecification[] required, HostSpecification host, ImportPackageSpecification[] imports, ExportPackageDescription[] exports, boolean singleton, boolean attachFragments, boolean dynamicFragments, String platformFilter, String[] executionEnvironments, GenericSpecification[] genericRequires, GenericDescription[] genericCapabilities, NativeCodeSpecification nativeCode);
 
@@ -294,6 +296,7 @@ public interface StateObjectFactory {
 	 * @param nativeCodeDescriptions the native code descriptors
 	 * @param optional whether the specification is optional
 	 * @return the created native code specification
+	 * @since 3.4
 	 */
 	public NativeCodeSpecification createNativeCodeSpecification(NativeCodeDescription[] nativeCodeDescriptions, boolean optional);
 
@@ -307,6 +310,7 @@ public interface StateObjectFactory {
 	 * @param filter the selection filter (may be <code>null</code>)
 	 * @return the created native code description
 	 * @throws InvalidSyntaxException if the selection filter is invalid
+	 * @since 3.4
 	 */
 	public NativeCodeDescription createNativeCodeDescription(String[] nativePaths, String[] processors, String[] osNames, VersionRange[] osVersions, String[] languages, String filter) throws InvalidSyntaxException;
 
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/VersionConstraint.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/VersionConstraint.java
index 8ad408f87..b61ad42b1 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/VersionConstraint.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/VersionConstraint.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ package org.eclipse.osgi.service.resolver;
  * {@link StateObjectFactory} should be used to construct instances.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface VersionConstraint extends Cloneable {
 
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/VersionRange.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/VersionRange.java
index 2f6e8fc39..a680b0131 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/VersionRange.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/service/resolver/VersionRange.java
@@ -15,6 +15,7 @@ import org.osgi.framework.Version;
 /**
  * This class represents a version range.
  * @since 3.1
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class VersionRange {
 	private static final Version versionMax = new Version(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java
index 3b3d22ab9..1bd7f2da3 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java
@@ -26,6 +26,7 @@ import java.util.Locale;
  * </p>
  * 
  * @since 3.2
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class TextProcessor {
 
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/console/CommandInterpreter.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/console/CommandInterpreter.java
index a22841825..213b81459 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/console/CommandInterpreter.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/console/CommandInterpreter.java
@@ -22,6 +22,7 @@ import org.osgi.framework.Bundle;
  * This interface is not intended to be implemented by clients.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface CommandInterpreter {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventListeners.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventListeners.java
index b99172b87..c7f7702b4 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventListeners.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventListeners.java
@@ -15,6 +15,7 @@ package org.eclipse.osgi.framework.eventmgr;
  * This class manages a list of listeners.
  * Listeners may be added or removed as necessary.
  * @since 3.1
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class EventListeners {
 	/**
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventManager.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventManager.java
index 38d4e010a..0b605e5be 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventManager.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/eventmgr/EventManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -94,6 +94,7 @@ import org.eclipse.osgi.framework.eventmgr.EventListeners.ListElement;
  * <p> The highly dynamic nature of the OSGi framework had necessitated these features for 
  * proper and efficient event delivery.  
  * @since 3.1
+ * @noextend This class is not intended to be subclassed by clients.
  */
 
 public class EventManager {
@@ -143,6 +144,7 @@ public class EventManager {
 	 * this EventManager.  A <code>null</code> value is allowed.
 	 * @param threadGroup The thread group to use for the asynchronous event
 	 * thread associated with this EventManager. A <code>null</code> value is allowed.
+	 * @since 3.4
 	 */
 	public EventManager(String threadName, ThreadGroup threadGroup) {
 		thread = null;
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
index bc2acae24..a858aad9e 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
@@ -50,6 +50,7 @@ import org.osgi.util.tracker.ServiceTracker;
  * </p>
  * <p>Note that the fields on this class are not API. </p>
  * @since 3.0
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class EclipseStarter {
 	private static FrameworkAdaptor adaptor;
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java
index da981a916..d9c664a4b 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java
@@ -26,6 +26,7 @@ import org.eclipse.osgi.service.datalocation.Location;
  * Clients may not extend this class.
  * </p>
  * @since 3.1
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class LocationManager {
 	private static Location installLocation = null;
diff --git a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/service/security/TrustEngine.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/service/security/TrustEngine.java
index 317473aa5..e4c9c977e 100644
--- a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/service/security/TrustEngine.java
+++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/service/security/TrustEngine.java
@@ -18,6 +18,9 @@ import org.eclipse.osgi.internal.signedcontent.TrustEngineListener;
 /**
  * A <code>TrustEngine</code> is used to establish the authenticity of a 
  * {@link Certificate} chain.
+ * <p>
+ * Clients may implement this interface.
+ * </p>
  * @since 3.4
  */
 public abstract class TrustEngine {
diff --git a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/InvalidContentException.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/InvalidContentException.java
index 7311b8980..846c307df 100644
--- a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/InvalidContentException.java
+++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/InvalidContentException.java
@@ -15,6 +15,7 @@ import java.io.IOException;
 /**
  * Indicates that signed content is invalid according to one of the signers.
  * @since 3.4
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class InvalidContentException extends IOException {
 	private static final long serialVersionUID = -399150159330289387L;
diff --git a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContent.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContent.java
index e77de260c..918f1a03c 100644
--- a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContent.java
+++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContent.java
@@ -25,6 +25,7 @@ import java.util.Date;
  * This interface is not intended to be implemented by clients.
  * </p>
  * @since 3.4
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface SignedContent {
 
diff --git a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java
index 2a1d5b47b..27f154b48 100644
--- a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java
+++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java
@@ -25,6 +25,7 @@ import java.io.IOException;
  * This interface is not intended to be implemented by clients.
  * </p>
  * @since 3.4
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface SignedContentEntry {
 	/**
diff --git a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContentFactory.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContentFactory.java
index 7964d5855..7a1024772 100644
--- a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContentFactory.java
+++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignedContentFactory.java
@@ -29,6 +29,7 @@ import org.osgi.framework.Bundle;
  * This interface is not intended to be implemented by clients.
  * </p>
  * @since 3.4
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface SignedContentFactory {
 	/**
diff --git a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignerInfo.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignerInfo.java
index 8810be2f6..c5bc14dd8 100644
--- a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignerInfo.java
+++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/signedcontent/SignerInfo.java
@@ -18,6 +18,7 @@ import java.security.cert.Certificate;
  * This interface is not intended to be implemented by clients.
  * </p>
  * @since 3.4
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface SignerInfo {
 
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java
index b99172b87..c7f7702b4 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventListeners.java
@@ -15,6 +15,7 @@ package org.eclipse.osgi.framework.eventmgr;
  * This class manages a list of listeners.
  * Listeners may be added or removed as necessary.
  * @since 3.1
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class EventListeners {
 	/**
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java
index 38d4e010a..0b605e5be 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/eventmgr/EventManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -94,6 +94,7 @@ import org.eclipse.osgi.framework.eventmgr.EventListeners.ListElement;
  * <p> The highly dynamic nature of the OSGi framework had necessitated these features for 
  * proper and efficient event delivery.  
  * @since 3.1
+ * @noextend This class is not intended to be subclassed by clients.
  */
 
 public class EventManager {
@@ -143,6 +144,7 @@ public class EventManager {
 	 * this EventManager.  A <code>null</code> value is allowed.
 	 * @param threadGroup The thread group to use for the asynchronous event
 	 * thread associated with this EventManager. A <code>null</code> value is allowed.
+	 * @since 3.4
 	 */
 	public EventManager(String threadName, ThreadGroup threadGroup) {
 		thread = null;
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLog.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLog.java
index ca0b7f0b4..123894ae0 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLog.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ import org.osgi.framework.FrameworkEvent;
  * FrameworkEvents of type ERROR.  The FrameworkLog may persist the log messages 
  * to the filesystem or allow other ways of accessing the log information.
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface FrameworkLog {
 	/**
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLogEntry.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLogEntry.java
index 18005b7dd..d64a4226e 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLogEntry.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/log/FrameworkLogEntry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@ package org.eclipse.osgi.framework.log;
 /**
  * A framework log entry used to log information to a FrameworkLog
  * @since 3.1
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class FrameworkLogEntry {
 	/**
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java
index a86504844..3c24442cc 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/datalocation/Location.java
@@ -21,6 +21,7 @@ import java.net.URL;
  * </p>
  * 
  * @since 3.0
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface Location {
 
@@ -168,6 +169,7 @@ public interface Location {
 	 * otherwise.
 	 * @return boolean value indicating whether or not this location is locked
 	 * @throws IOException if there was an unexpected problem reading the lock
+	 * @since 3.4
 	 */
 	public boolean isLocked() throws IOException;
 
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
index 9ea62b4b7..e8871b55b 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
@@ -11,10 +11,12 @@
 package org.eclipse.osgi.service.environment;
 
 /**
+ * Constants used with the {@link EnvironmentInfo} service.
  * @since 3.0
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface Constants {
 	//TODO These constants need to be aligned with the OSGi ones. See page 64-588 of the spec
@@ -64,6 +66,7 @@ public interface Constants {
 	/**
 	 * Constant string (value "epoc32") indicating the platform is running on a
 	 * Epoc 32-bit Symbian operating system.
+	 * @since 3.4
 	 */
 	public static final String OS_EPOC32 = "epoc32";//$NON-NLS-1$
 
@@ -167,6 +170,7 @@ public interface Constants {
 	/**
 	 * Constant string (value "s60") indicating the platform is running on a
 	 * machine using the S60 windowing system.
+	 * @since 3.4
 	 */
 	public static final String WS_S60 = "s60";//$NON-NLS-1$
 
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/EnvironmentInfo.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/EnvironmentInfo.java
index 6c3c85b94..bbb058857 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/EnvironmentInfo.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/EnvironmentInfo.java
@@ -20,9 +20,10 @@ package org.eclipse.osgi.service.environment;
  * </p>
  * 
  * @since 3.0
- * XXX Need to add a method that gets the real application args.
- * We might also want to explain how the command line is organized: fwk / non fwk. Non-fwk is rt args and app args.
+ * @noimplement This interface is not intended to be implemented by clients.
  */
+// TODO  Need to add a method that gets the real application args.
+//We might also want to explain how the command line is organized: fwk / non fwk. Non-fwk is rt args and app args.
 public interface EnvironmentInfo {
 
 	/**
@@ -116,6 +117,7 @@ public interface EnvironmentInfo {
 	 * </p>
 	 * @param key the property key
 	 * @return the value of the property, or null
+	 * @since 3.4
 	 */
 	public String getProperty(String key);
 
@@ -131,6 +133,7 @@ public interface EnvironmentInfo {
 	 * @param key the property key
 	 * @param value the value of the property
 	 * @return the old value of the property, or null
+	 * @since 3.4
 	 */
 	public String setProperty(String key, String value);
 }
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/BundleLocalization.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/BundleLocalization.java
index 31b4ff3d9..ceda998c6 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/BundleLocalization.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/localization/BundleLocalization.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,6 +20,7 @@ import org.osgi.framework.Bundle;
  * This interface is not intended to be implemented by clients.
  * </p>
  * @since 3.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface BundleLocalization {
 
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationLauncher.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationLauncher.java
index e08e1ebde..b1be943d3 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationLauncher.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/runnable/ApplicationLauncher.java
@@ -19,6 +19,7 @@ package org.eclipse.osgi.service.runnable;
  * </p>
  * 
  * @since 3.2
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ApplicationLauncher {
 	/**
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java
index 4c4cf045d..e0fc40338 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/ManagedOutputStream.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ import java.io.*;
  * <p>
  * Clients may not extend this class.
  * </p>
+ * @noextend This class is not intended to be subclassed by clients.
  * @since 3.2
  */
 // Note the implementation of this class originated from the following deprecated classes:
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java
index 54906d843..d96a8fd15 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,6 +78,7 @@ import org.eclipse.osgi.framework.util.SecureAction;
  * content as it was when the instance was first opened.
  * </p>
  * @since 3.2
+ * @noextend This class is not intended to be subclassed by clients.
  */
 
 // Note the implementation of this class originated from the following deprecated classes: 
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java
index bc30abb96..9e103a7c2 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java
@@ -64,6 +64,7 @@ import org.osgi.framework.BundleException;
  * </p>
  * 
  * @since 3.0
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class ManifestElement {