[260054] Support for API tools
diff --git a/plugins/org.eclipse.jst.server.core/.project b/plugins/org.eclipse.jst.server.core/.project
index 7d5e17d..6def0c2 100644
--- a/plugins/org.eclipse.jst.server.core/.project
+++ b/plugins/org.eclipse.jst.server.core/.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/plugins/org.eclipse.jst.server.core/.settings/.api_filters b/plugins/org.eclipse.jst.server.core/.settings/.api_filters
new file mode 100644
index 0000000..557b505
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.core/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.jst.server.core" version="2">
+    <resource path="src/org/eclipse/jst/server/core/IWebModule.java" type="org.eclipse.jst.server.core.IWebModule">
+        <filter id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.jst.server.core.IWebModule"/>
+                <message_argument value="getContextRoot(IModule)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/EJBBean.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/EJBBean.java
index 4f6e87d..2916732 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/EJBBean.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/EJBBean.java
@@ -22,12 +22,24 @@
  * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
  * (repeatedly) as the API evolves.
  * </p>
- * @plannedfor 3.0
+ * @since 1.1
  */
 public class EJBBean extends ModuleArtifactDelegate {
+	/**
+	 * @since 1.1
+	 */
 	public final static String EJB_11 = "1.1";
+	/**
+	 * @since 1.1
+	 */
 	public final static String EJB_20 = "2.0";
+	/**
+	 * @since 1.1
+	 */
 	public final static String EJB_21 = "2.1";
+	/**
+	 * @since 1.1
+	 */
 	public final static String EJB_30 = "3.0";
 	
 	private String jndiName;
@@ -64,6 +76,7 @@
 	 * @param local <code>true</code> if the EJB has a local interface, and
 	 *    <code>false</code> otherwise
 	 * @param version the level of the EJB specification that this EJB uses. Use one of the <code>EJB_xx</code> constants declared on {@link EJBBean}
+	 * @since 1.1
 	 */
 	public EJBBean(IModule module, String jndiName, boolean remote, boolean local, String version) {
 		super(module);
@@ -84,6 +97,7 @@
 	 *    <code>false</code> otherwise    
 	 * @param version the level of the EJB specification that this EJB uses. Use one of the <code>EJB_xx</code> constants declared on {@link EJBBean}
 	 * @param interfaceName the interface name of the EJB
+	 * @since 1.1
 	 */
 
 	public EJBBean(IModule module, String jndiName, boolean remote, boolean local, String version, String interfaceName) {
@@ -135,6 +149,7 @@
 	 * Returns the level of the specification of the EJB
 	 *
 	 * @return the level of the specification of the EJB
+	 * @since 1.1
 	 */
 	public String getVersion() {
 		return version;
@@ -191,8 +206,10 @@
 	}
 
 	/**
-	 * Gets the name of interface represented by this object 
-	 * @return
+	 * Gets the name of interface represented by this object
+	 *  
+	 * @return the interface name
+	 * @since 1.1
 	 */
 	public String getInterfaceName() {
 		return interfaceName;
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntimeWorkingCopy.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntimeWorkingCopy.java
index 7bc627c..3fe5075 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntimeWorkingCopy.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IJavaRuntimeWorkingCopy.java
@@ -19,7 +19,7 @@
  * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
  * (repeatedly) as the API evolves.
  * </p>
- * @since 3.0
+ * @since 1.1
  */
 public interface IJavaRuntimeWorkingCopy extends IJavaRuntime {
 	/**
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebModule.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebModule.java
index 6f22061..959ef2f 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebModule.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/IWebModule.java
@@ -19,25 +19,27 @@
  * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
  * (repeatedly) as the API evolves.
  * </p>
+ * 
  * @plannedfor 3.0
  */
 public interface IWebModule extends IJ2EEModule {
 	/**
 	 * Returns the context root of the module.
 	 * 
-	 * @return java.lang.String
+	 * @return the context root
 	 */
 	public String getContextRoot();
-		
+
 	/**
 	 * Returns the context root of the module. If the the webModule belongs to an earModule, the context root with higher
-	 * presedence will be returned.   
+	 * precedence will be returned.   
 	 * 
 	 * @param earModule The EARModule if exist, if not null
-	 * @return java.lang.String
+	 * @return the context root
+	 * @since 1.1
 	 */
 	public String getContextRoot(IModule earModule);
-	
+
 	/**
 	 * Returns the utility modules contained within this WAR.
 	 *
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/.project b/plugins/org.eclipse.jst.server.preview.adapter/.project
index 1e67cda..d1b683f 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/.project
+++ b/plugins/org.eclipse.jst.server.preview.adapter/.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/plugins/org.eclipse.jst.server.ui/.project b/plugins/org.eclipse.jst.server.ui/.project
index abd835d..c7c992d 100644
--- a/plugins/org.eclipse.jst.server.ui/.project
+++ b/plugins/org.eclipse.jst.server.ui/.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/plugins/org.eclipse.wst.server.core/.project b/plugins/org.eclipse.wst.server.core/.project
index bf1e7ef..7593f12 100644
--- a/plugins/org.eclipse.wst.server.core/.project
+++ b/plugins/org.eclipse.wst.server.core/.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/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModule.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModule.java
index c41c73c..7aad1e3 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModule.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IModule.java
@@ -42,6 +42,7 @@
  * </p>
  * <p>This interface is not intended to be implemented by clients.</p>
  * 
+ * @noimplement
  * @since 1.0
  */
 public interface IModule extends IAdaptable {
@@ -96,6 +97,7 @@
 	 * 
 	 * @return <code>true</code> if the module exists,
 	 *    and <code>false</code> otherwise
+	 * @since 1.1
 	 */
 	public boolean exists();
 
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServer.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServer.java
index 0418174..1cd68ea 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServer.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/IServer.java
@@ -69,6 +69,7 @@
  * 
  * <p>This interface is not intended to be implemented by clients.</p>
  * 
+ * @noimplement
  * @since 1.0
  */
 public interface IServer extends IServerAttributes, ISchedulingRule {
@@ -691,7 +692,7 @@
 	 * 
 	 * @return the launch used to start the currently running server, or <code>null</code>
 	 *    if the launch is unavailable or could not be found
-	 * @since 3.0
+	 * @since 1.1
 	 */
 	public ILaunch getLaunch();
 
@@ -699,7 +700,7 @@
 	 * Returns the start timeout in seconds.
 	 * 
 	 * @return the start timeout in seconds
-	 * @since 3.0
+	 * @since 1.1
 	 */
 	public int getStartTimeout();
 
@@ -707,7 +708,7 @@
 	 * Returns the stop timeout in seconds.
 	 * 
 	 * @return the stop timeout in seconds
-	 * @since 3.0
+	 * @since 1.1
 	 */
 	public int getStopTimeout();
 
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
index 66b6f0f..3fb737b 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
@@ -458,7 +458,7 @@
 	 * 
 	 * @return <code>true</code> if the preference is set to automatically
 	 *    publish when starting servers, or <code>false</code> otherwise
-	 * @since 3.0
+	 * @since 1.1
 	 */
 	public static boolean isAutoPublishing() {
 		return ServerPreferences.getInstance().isAutoPublishing();
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublisherDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublisherDelegate.java
index 27cc380..e4b7093 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublisherDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/PublisherDelegate.java
@@ -23,7 +23,8 @@
  * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
  * (repeatedly) as the API evolves.
  * </p>
- * @plannedfor 3.1
+ * 
+ * @since 1.1
  */
 public abstract class PublisherDelegate {
 	private TaskModel model;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerBehaviourDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerBehaviourDelegate.java
index d3a055b..2824daa 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerBehaviourDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ServerBehaviourDelegate.java
@@ -44,6 +44,7 @@
  * to extend the <code>serverTypes</code> extension point.
  * </p>
  * 
+ * @noimplement
  * @see IServer
  * @see IServerWorkingCopy
  * @since 1.0
@@ -433,7 +434,7 @@
 	 *    {@link org.eclipse.debug.core.ILaunchManager}
 	 * @return a status object with code <code>IStatus.OK</code> if the server can
 	 *    be started, otherwise a status object indicating why it can't
-    * @since 3.0
+    * @since 1.1
 	 */
 	public IStatus canStart(String launchMode) {
 		return Status.OK_STATUS;
@@ -461,7 +462,7 @@
 	 *    {@link org.eclipse.debug.core.ILaunchManager}
 	 * @return a status object with code <code>IStatus.OK</code> if the server can
 	 *    be restarted, otherwise a status object indicating why it can't
-    * @since 3.0
+    * @since 1.1
 	 */
 	public IStatus canRestart(String mode) {
 		return Status.OK_STATUS;
@@ -487,7 +488,7 @@
 	 * 
 	 * @return a status object with code <code>IStatus.OK</code> if the server can
 	 *   be stopped, otherwise a status object indicating why it can't
-    * @since 3.0
+    * @since 1.1
 	 */
 	public IStatus canStop() {
 		return Status.OK_STATUS;
@@ -511,7 +512,7 @@
 	 * 
 	 * @return a status object with code <code>IStatus.OK</code> if the server can
 	 *   be published to, otherwise a status object indicating what is wrong
-    * @since 3.0
+    * @since 1.1
 	 */
 	public IStatus canPublish() {
 		return Status.OK_STATUS;
@@ -1065,6 +1066,7 @@
 	 *    it should minimally contain an adapter for the
 	 *    org.eclipse.swt.widgets.Shell.class
 	 * @throws CoreException
+	 * @since 1.1
 	 */
 	protected MultiStatus executePublishers(int kind, List<IModule[]> modules, IProgressMonitor monitor, IAdaptable info) throws CoreException {
 		Publisher[] publishers = ((Server)getServer()).getEnabledPublishers();
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ModuleFile.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ModuleFile.java
index e229fc8..25cb2df 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ModuleFile.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ModuleFile.java
@@ -19,7 +19,7 @@
  * An implementation of {@link IModuleFile} for physical files on disk or in the
  * workspace.
  *
- * @since 3.0
+ * @since 1.1
  */
 public class ModuleFile implements IModuleFile {
 	private IFile file;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ModuleFolder.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ModuleFolder.java
index 6d9147f..9874138 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ModuleFolder.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ModuleFolder.java
@@ -19,7 +19,7 @@
  * An implementation of {@link IModuleFolder} for physical folders on disk or in the
  * workspace.
  *
- * @since 3.0
+ * @since 1.1
  */
 public class ModuleFolder implements IModuleFolder {
 	private static final IModuleResource[] EMPTY_RESOURCE_ARRAY = new IModuleResource[0];
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/PublishHelper.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/PublishHelper.java
index 3b8d979..1392296 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/PublishHelper.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/PublishHelper.java
@@ -32,7 +32,7 @@
 /**
  * Utility class with an assortment of useful publishing file methods.
  *
- * @since 3.0
+ * @since 1.1
  */
 public final class PublishHelper {
 	// size of the buffer
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/PublishUtil.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/PublishUtil.java
index 66e0247..483adfa 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/PublishUtil.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/PublishUtil.java
@@ -67,6 +67,7 @@
 	 * @param monitor a progress monitor, or <code>null</code> if progress
 	 *    reporting and cancellation are not desired
 	 * @return a possibly-empty array of error and warning status 
+	 * @since 1.1
 	 */
 	public static IStatus[] publishSmart(IModuleResource[] resources, IPath path, IPath[] ignore, IProgressMonitor monitor) {
 		return publishHelper.publishSmart(resources, path, ignore, monitor);
diff --git a/plugins/org.eclipse.wst.server.discovery/.project b/plugins/org.eclipse.wst.server.discovery/.project
index e507490..7edf589 100644
--- a/plugins/org.eclipse.wst.server.discovery/.project
+++ b/plugins/org.eclipse.wst.server.discovery/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.wst.server.discovery.internal</name>
+	<name>org.eclipse.wst.server.discovery</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.eclipse.wst.server.http.core/.project b/plugins/org.eclipse.wst.server.http.core/.project
index c94c165..05c516a 100644
--- a/plugins/org.eclipse.wst.server.http.core/.project
+++ b/plugins/org.eclipse.wst.server.http.core/.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/plugins/org.eclipse.wst.server.http.ui/.project b/plugins/org.eclipse.wst.server.http.ui/.project
index 5a8769f..a231f50 100644
--- a/plugins/org.eclipse.wst.server.http.ui/.project
+++ b/plugins/org.eclipse.wst.server.http.ui/.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/plugins/org.eclipse.wst.server.preview.adapter/.project b/plugins/org.eclipse.wst.server.preview.adapter/.project
index 32a9232..e6caf77 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/.project
+++ b/plugins/org.eclipse.wst.server.preview.adapter/.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/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF
index ed61ee7..1ce6c06 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF
@@ -12,3 +12,5 @@
  org.eclipse.wst.common.project.facet.ui;bundle-version="[1.2.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.wst.server.preview.adapter.internal.core;x-internal:=true,
+ org.eclipse.wst.server.preview.adapter.internal.ui;x-internal:=true
diff --git a/plugins/org.eclipse.wst.server.preview/.project b/plugins/org.eclipse.wst.server.preview/.project
index 7ad37a7..e306751 100644
--- a/plugins/org.eclipse.wst.server.preview/.project
+++ b/plugins/org.eclipse.wst.server.preview/.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/plugins/org.eclipse.wst.server.ui/.project b/plugins/org.eclipse.wst.server.ui/.project
index eeeba70..7f6ebbf 100644
--- a/plugins/org.eclipse.wst.server.ui/.project
+++ b/plugins/org.eclipse.wst.server.ui/.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/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/IServerModule.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/IServerModule.java
index 79c9217..5f04206 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/IServerModule.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/IServerModule.java
@@ -16,7 +16,7 @@
  * A helper interface for modules that are deployed to a server, commonly
  * used to help actions interact with modules in the Servers view.
  *
- * @since 3.0
+ * @since 1.1
  */
 public interface IServerModule {
 	/**
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java
index 6aad065..bb8fa61 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorPart.java
@@ -96,7 +96,7 @@
 	 * Set the managed form that this part is using.
 	 * 
 	 * @param managedForm a managed form
-	 * @since 3.0
+	 * @since 1.1
 	 */
 	protected void setManagedForm(IManagedForm managedForm) {
 		this.managedForm = managedForm;
@@ -108,7 +108,7 @@
 	 * 
 	 * @return managedForm the managed form that this part is using, or <code>null</code>
 	 *    if no managed form has been set
-	 * @since 3.0
+	 * @since 1.1
 	 */
 	protected IManagedForm getManagedForm() {
 		return managedForm;
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java
index bd5dae5..88824d8 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/editor/ServerEditorSection.java
@@ -161,7 +161,7 @@
 	 * 
 	 * @return the managed form that the editor is using, or <code>null</code> if no
 	 *    managed form has been set
-	 * @since 3.0
+	 * @since 1.1
 	 */
 	protected IManagedForm getManagedForm() {
 		return editor.getManagedForm();