[138705] Fix schema
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/EJBBean.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/EJBBean.java
index 6694961..f9b1406 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/EJBBean.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/EJBBean.java
@@ -20,7 +20,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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public class EJBBean implements IModuleArtifact {
private IModule module;
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IApplicationClientModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IApplicationClientModule.java
index c4d10e1..1f41d34 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IApplicationClientModule.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IApplicationClientModule.java
@@ -17,7 +17,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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public interface IApplicationClientModule extends IJ2EEModule {
// intentionally empty
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IConnectorModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IConnectorModule.java
index 9cb3c9a..a459c74 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IConnectorModule.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IConnectorModule.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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public interface IConnectorModule extends IJ2EEModule {
/**
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IEJBModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IEJBModule.java
index 83dcac7..9596a04 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IEJBModule.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IEJBModule.java
@@ -17,7 +17,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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public interface IEJBModule extends IJ2EEModule {
// intentionally empty
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IEnterpriseApplication.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IEnterpriseApplication.java
index d22376d..6b9797b 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IEnterpriseApplication.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IEnterpriseApplication.java
@@ -20,7 +20,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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public interface IEnterpriseApplication {
/**
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IJ2EEModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IJ2EEModule.java
index f116a87..dd9fcd1 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IJ2EEModule.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IJ2EEModule.java
@@ -20,7 +20,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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public interface IJ2EEModule {
/**
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IJavaRuntime.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IJavaRuntime.java
index 9081821..dd7067f 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IJavaRuntime.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IJavaRuntime.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 1.5
+ * @since 2.0
*/
public interface IJavaRuntime {
/**
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IUtilityModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IUtilityModule.java
index 7242fd8..96e4f00 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IUtilityModule.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IUtilityModule.java
@@ -20,7 +20,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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public interface IUtilityModule {
/**
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IWebModule.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IWebModule.java
index 0bc0b17..92dffcf 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IWebModule.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/IWebModule.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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public interface IWebModule extends IJ2EEModule {
/**
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JndiLaunchable.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JndiLaunchable.java
index 542efbd..abc0d8f 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JndiLaunchable.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JndiLaunchable.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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public class JndiLaunchable {
private Properties props;
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JndiObject.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JndiObject.java
index bae4411..b7a3751 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JndiObject.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/JndiObject.java
@@ -20,7 +20,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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public class JndiObject implements IModuleArtifact {
private IModule module;
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/PublishUtil.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/PublishUtil.java
index a87eb65..fd7480d 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/PublishUtil.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/PublishUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * Copyright (c) 2003, 2006 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
@@ -35,7 +35,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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public class PublishUtil {
// size of the buffer
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java
index 617f8cd..784bee0 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/RuntimeClasspathProviderDelegate.java
@@ -43,7 +43,7 @@
* (repeatedly) as the API evolves.
* </p>
*
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public abstract class RuntimeClasspathProviderDelegate {
private class SourceAttachmentUpdate {
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/Servlet.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/Servlet.java
index 7f7c5aa..f2a78cd 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/Servlet.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/Servlet.java
@@ -20,7 +20,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>
- * @plannedfor 1.5
+ * @plannedfor 2.0
*/
public class Servlet implements IModuleArtifact {
private IModule module;
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IContentFilter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IContentFilter.java
index 82d3144..e1d7205 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IContentFilter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IContentFilter.java
@@ -18,7 +18,6 @@
* <p>
* This interface is not intended to be implemented by clients.
* </p>
- * @plannedfor 1.0
*/
public interface IContentFilter {
/**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IProtocolAdapter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IProtocolAdapter.java
index 9952086..d10626d 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IProtocolAdapter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IProtocolAdapter.java
@@ -23,8 +23,6 @@
* <p>
* This interface is not intended to be implemented by clients.
* </p>
- *
- * @plannedfor 1.0
*/
public interface IProtocolAdapter {
/**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IStartup.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IStartup.java
index 422e534..0fffd5d 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IStartup.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IStartup.java
@@ -14,8 +14,6 @@
* Plug-ins that register a startup extension will be activated when the monitor
* core plug-in initializes and have an opportunity to run code that can't be
* implemented using the normal contribution mechanisms.
- *
- * @plannedfor 1.0
*/
public interface IStartup {
/**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapterDelegate.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapterDelegate.java
index 6e94723..eef98e5 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapterDelegate.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapterDelegate.java
@@ -39,8 +39,6 @@
* system when the monitor is changed or deleted, or when the plug-in is
* being shut down.]
* </p>
- *
- * @plannedfor 1.0
*/
public abstract class ProtocolAdapterDelegate {
/**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/ContentFilterDelegate.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/ContentFilterDelegate.java
index 126878d..87fc139 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/ContentFilterDelegate.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/ContentFilterDelegate.java
@@ -30,8 +30,6 @@
* I assume that filters operate on the byte stream and aren't concerned with UI presentation...
* but usually UI's and filters are tightly coupled.
* </p>
- *
- * @plannedfor 1.0
*/
public abstract class ContentFilterDelegate {
/**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitor.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitor.java
index 0bc79b7..461a874 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitor.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitor.java
@@ -33,7 +33,6 @@
* This interface is not intended to be implemented by clients.
* </p>
* @see IMonitorWorkingCopy
- * @plannedfor 1.0
*/
public interface IMonitor {
/**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitorListener.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitorListener.java
index b94877d..b4db6ca 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitorListener.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitorListener.java
@@ -15,8 +15,6 @@
* Clients should implement this interface and register
* their listener via {@link MonitorCore#addMonitorListener(IMonitorListener)}.
* </p>
- *
- * @plannedfor 1.0
*/
public interface IMonitorListener {
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitorWorkingCopy.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitorWorkingCopy.java
index 6ecde49..acef8c0 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitorWorkingCopy.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IMonitorWorkingCopy.java
@@ -22,7 +22,6 @@
* This interface is not intended to be implemented by clients.
* </p>
* @see IMonitor
- * @plannedfor 1.0
*
* [issue : CS - it sounds like this is something useful for creating monitors.
* Shouldn't this be called a IMonitorConfiguration? Is there an advantage to making
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IRequestListener.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IRequestListener.java
index 5a6f19b..fb11bea 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IRequestListener.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/IRequestListener.java
@@ -22,7 +22,6 @@
* </p>
*
* @see IMonitor#addRequestListener(IRequestListener)
- * @plannedfor 1.0
*/
public interface IRequestListener {
/**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/MonitorCore.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/MonitorCore.java
index ef26fc0..7913161 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/MonitorCore.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/MonitorCore.java
@@ -20,8 +20,6 @@
* This class provides all functionality through static members. It is not intended
* to be instantiated or subclassed.
* </p>
- *
- * @plannedfor 1.0
*/
public final class MonitorCore {
private static MonitorManager manager;
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/Request.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/Request.java
index 2abd48c..e53cb9a 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/Request.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/provisional/Request.java
@@ -30,8 +30,6 @@
* This interface is intended to be extended only by clients
* to extend the <code>protocolAdapters</code> extension point.
* </p>
- *
- * @plannedfor 1.0
*/
public class Request implements IAdaptable {
protected Monitor monitor;
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/provisional/ContentViewer.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/provisional/ContentViewer.java
index d8b57d7..f9e1b10 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/provisional/ContentViewer.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/provisional/ContentViewer.java
@@ -33,7 +33,6 @@
* [issue: CS - If a ContentViewer is editable, does that mean we can edit the
* bytes of the message and resend it across the wire? How is an editable ContentViewer
* handled differently by the framework? Perhaps an example of what an editeable viewer would do. ]
- * @plannedfor 1.0
*/
public abstract class ContentViewer {
/**
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/provisional/MonitorUICore.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/provisional/MonitorUICore.java
index bd9dbd2..26fb3ff 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/provisional/MonitorUICore.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/provisional/MonitorUICore.java
@@ -18,8 +18,6 @@
* This class provides all functionality through static members. It is not intended
* to be instantiated or subclassed.
* </p>
- *
- * @plannedfor 1.0
*/
public final class MonitorUICore {
/**
diff --git a/plugins/org.eclipse.wst.server.core/plugin.properties b/plugins/org.eclipse.wst.server.core/plugin.properties
index 3e392f5..cf4ddf5 100644
--- a/plugins/org.eclipse.wst.server.core/plugin.properties
+++ b/plugins/org.eclipse.wst.server.core/plugin.properties
@@ -28,4 +28,4 @@
extensionPointInstallableRuntimes=Installable Runtimes
moduleTypeUnknown=Unknown module
-moduleTypeJ2EEUtilityName=Static Web project
+moduleTypeStaticWebName=Static Web project
diff --git a/plugins/org.eclipse.wst.server.core/plugin.xml b/plugins/org.eclipse.wst.server.core/plugin.xml
index 8843c09..0f905c9 100644
--- a/plugins/org.eclipse.wst.server.core/plugin.xml
+++ b/plugins/org.eclipse.wst.server.core/plugin.xml
@@ -24,6 +24,6 @@
name="%moduleTypeUnknown"/>
<moduleType
id="wst.web"
- name="%moduleTypeJ2EEUtilityName"/>
+ name="%moduleTypeStaticWebName"/>
</extension>
</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.core/schema/internalServerLocators.exsd b/plugins/org.eclipse.wst.server.core/schema/internalServerLocators.exsd
index 729e8ca..8ef14c3 100644
--- a/plugins/org.eclipse.wst.server.core/schema/internalServerLocators.exsd
+++ b/plugins/org.eclipse.wst.server.core/schema/internalServerLocators.exsd
@@ -67,14 +67,14 @@
<attribute name="supportsRemoteHosts" type="string" use="required">
<annotation>
<documentation>
- local and/or remote
+ true if the server supports remote server support, and false if only local servers are supported
</documentation>
</annotation>
</attribute>
<attribute name="typeIds" type="string" use="required">
<annotation>
<documentation>
-
+ a comma separated list of server type ids. May include wildcards (*) at the end of an id
</documentation>
</annotation>
</attribute>
diff --git a/plugins/org.eclipse.wst.server.core/schema/launchableAdapters.exsd b/plugins/org.eclipse.wst.server.core/schema/launchableAdapters.exsd
index d2f9701..8ee715b 100644
--- a/plugins/org.eclipse.wst.server.core/schema/launchableAdapters.exsd
+++ b/plugins/org.eclipse.wst.server.core/schema/launchableAdapters.exsd
@@ -69,7 +69,7 @@
<attribute name="typeIds" type="string">
<annotation>
<documentation>
-
+ a comma separated list of server type ids. May include wildcards (*) at the end of an id
</documentation>
</annotation>
</attribute>
@@ -111,7 +111,7 @@
Value of the attribute <b>class</b> must be a fully qualified name of a Java class that extends <code>org.eclipse.wst.server.core.model.LaunchableAdapterDelegate</code> and contains a public 0-arg constructor.
</documentation>
</annotation>
-
+
<annotation>
<appInfo>
<meta.section type="implementation"/>
diff --git a/plugins/org.eclipse.wst.server.core/schema/moduleFactories.exsd b/plugins/org.eclipse.wst.server.core/schema/moduleFactories.exsd
index 7181577..02dea92 100644
--- a/plugins/org.eclipse.wst.server.core/schema/moduleFactories.exsd
+++ b/plugins/org.eclipse.wst.server.core/schema/moduleFactories.exsd
@@ -60,7 +60,7 @@
<annotation>
<documentation>
specifies the fully qualified name of the Java class that extends <samp>ModuleFactoryDelegate</samp>.
-Module factory instances of this type will delegate to instances of this class.
+Module factory instances of this type will delegate to instances of this class
</documentation>
<appInfo>
<meta.attribute kind="java" basedOn="org.eclipse.wst.server.core.model.ModuleFactoryDelegate"/>
@@ -70,14 +70,14 @@
<attribute name="projects" type="boolean">
<annotation>
<documentation>
-
+ true if this factory may return projects within the workspace, and false otherwise
</documentation>
</annotation>
</attribute>
<attribute name="order" type="string">
<annotation>
<documentation>
-
+ an integer that specifies the order that the module factory is processed
</documentation>
</annotation>
</attribute>
@@ -89,14 +89,14 @@
<attribute name="types" type="string" use="required">
<annotation>
<documentation>
-
+ a comma separated list of module type ids
</documentation>
</annotation>
</attribute>
<attribute name="versions" type="string" use="required">
<annotation>
<documentation>
-
+ a comma separated list of module versions
</documentation>
</annotation>
</attribute>
diff --git a/plugins/org.eclipse.wst.server.core/schema/runtimeLocators.exsd b/plugins/org.eclipse.wst.server.core/schema/runtimeLocators.exsd
index 5f4561b..5fc095d 100644
--- a/plugins/org.eclipse.wst.server.core/schema/runtimeLocators.exsd
+++ b/plugins/org.eclipse.wst.server.core/schema/runtimeLocators.exsd
@@ -67,7 +67,7 @@
<attribute name="typeIds" type="string" use="required">
<annotation>
<documentation>
-
+ a comma separated list of runtime type ids. May include wildcards (*) at the end of an id
</documentation>
</annotation>
</attribute>
@@ -111,7 +111,7 @@
Value of the attribute <b>class</b> must be a fully qualified name of a Java class that extends <code>org.eclipse.wst.server.core.model.RuntimeLocatorDelegate</code> and contains a public 0-arg constructor.
</documentation>
</annotation>
-
+
<annotation>
<appInfo>
<meta.section type="implementation"/>
diff --git a/plugins/org.eclipse.wst.server.core/schema/runtimeTargetHandlers.exsd b/plugins/org.eclipse.wst.server.core/schema/runtimeTargetHandlers.exsd
index b910392..29e23f8 100644
--- a/plugins/org.eclipse.wst.server.core/schema/runtimeTargetHandlers.exsd
+++ b/plugins/org.eclipse.wst.server.core/schema/runtimeTargetHandlers.exsd
@@ -42,7 +42,7 @@
<element name="runtimeTargetHandler">
<annotation>
<appInfo>
- <meta.element labelAttribute="name"/>
+ <meta.element labelAttribute="name" deprecated="true"/>
</appInfo>
</annotation>
<complexType>
@@ -119,7 +119,7 @@
Value of the attribute <b>class</b> must be a fully qualified name of a Java class that extends <code>org.eclipse.wst.server.core.model.RuntimeTargetHandlerDelegate</code> and contains a public 0-arg constructor.
</documentation>
</annotation>
-
+
<annotation>
<appInfo>
<meta.section type="implementation"/>
diff --git a/plugins/org.eclipse.wst.server.core/schema/serverTypes.exsd b/plugins/org.eclipse.wst.server.core/schema/serverTypes.exsd
index fdc5836..39b0ee9 100644
--- a/plugins/org.eclipse.wst.server.core/schema/serverTypes.exsd
+++ b/plugins/org.eclipse.wst.server.core/schema/serverTypes.exsd
@@ -74,7 +74,7 @@
<annotation>
<documentation>
specifies the fully qualified name of the Java class that extends <samp>org.eclipse.wst.server.core.model.ServerDelegate</samp>.
-Server instances of this type will delegate to instances of this class. Delegates must also have a public 0-arg constructor.
+Server instances of this type will delegate to instances of this class. Delegates must also have a public 0-arg constructor
</documentation>
<appInfo>
<meta.attribute kind="java" basedOn="org.eclipse.wst.server.core.model.ServerDelegate"/>
@@ -85,7 +85,7 @@
<annotation>
<documentation>
specifies the fully qualified name of the Java class that implements <samp>org.eclipse.wst.server.core.model.ServerBehaviourDelegate</samp>.
-Server instances of this type will delegate to instances of this class. Delegates must also have a public 0-arg constructor.
+Server instances of this type will delegate to instances of this class. Delegates must also have a public 0-arg constructor
</documentation>
<appInfo>
<meta.attribute kind="java" basedOn="org.eclipse.wst.server.core.model.ServerBehaviourDelegate"/>
@@ -102,7 +102,7 @@
<attribute name="runtimeTypeId" type="string" use="required">
<annotation>
<documentation>
-
+ the runtime type id that this server type corresponds to
</documentation>
</annotation>
</attribute>
@@ -123,14 +123,14 @@
<attribute name="runtime" type="boolean">
<annotation>
<documentation>
- "true" if this server requires a runtime, "false" otherwise
+ true if this server requires a runtime, and false otherwise
</documentation>
</annotation>
</attribute>
<attribute name="launchModes" type="string">
<annotation>
<documentation>
- the launch modes that this server supports
+ a comma separated list of the launch modes that this server supports
</documentation>
</annotation>
</attribute>
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/provisional/ServerLocatorDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/provisional/ServerLocatorDelegate.java
index 04b9a67..a27151a 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/provisional/ServerLocatorDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/provisional/ServerLocatorDelegate.java
@@ -19,8 +19,6 @@
* This abstract class is intended to be extended only by clients
* to extend the <code>serverLocators</code> extension point.
* </p>
- *
- * @plannedfor 1.0
*/
public abstract class ServerLocatorDelegate {
/**
diff --git a/plugins/org.eclipse.wst.server.ui/schema/audio.exsd b/plugins/org.eclipse.wst.server.ui/schema/audio.exsd
index 1d3376b..18c2254 100644
--- a/plugins/org.eclipse.wst.server.ui/schema/audio.exsd
+++ b/plugins/org.eclipse.wst.server.ui/schema/audio.exsd
@@ -52,14 +52,14 @@
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
- specifies a unique identifier for this extension point
+ specifies a unique identifier for this category
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string" use="required">
<annotation>
<documentation>
-
+ a translatable name used to identify this category
</documentation>
</annotation>
</attribute>
@@ -71,21 +71,21 @@
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
-
+ specifies a unique identifier for this sound
</documentation>
</annotation>
</attribute>
<attribute name="category" type="string" use="required">
<annotation>
<documentation>
-
+ a category id
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string" use="required">
<annotation>
<documentation>
-
+ a translatable name used to identify this sound
</documentation>
</annotation>
</attribute>
@@ -127,7 +127,7 @@
</documentation>
</annotation>
-
+
<annotation>
<appInfo>
<meta.section type="implementation"/>
diff --git a/plugins/org.eclipse.wst.server.ui/schema/editorActions.exsd b/plugins/org.eclipse.wst.server.ui/schema/editorActions.exsd
index 0ea2f4a..ede4998 100644
--- a/plugins/org.eclipse.wst.server.ui/schema/editorActions.exsd
+++ b/plugins/org.eclipse.wst.server.ui/schema/editorActions.exsd
@@ -54,7 +54,7 @@
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
- specifies a unique identifier for this extension point
+ specifies a unique identifier for this action
</documentation>
</annotation>
</attribute>
@@ -71,14 +71,14 @@
<attribute name="typeIds" type="string">
<annotation>
<documentation>
-
+ a comma separated list of server type ids. May include wildcards (*) at the end of an id
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string">
<annotation>
<documentation>
-
+ a translatable name used to identify this action
</documentation>
<appInfo>
<meta.attribute translatable="true"/>
@@ -88,7 +88,7 @@
<attribute name="order" type="string">
<annotation>
<documentation>
-
+ an integer that specifies an absolute ordering of the action relative to other actions
</documentation>
</annotation>
</attribute>
diff --git a/plugins/org.eclipse.wst.server.ui/schema/editorPageSections.exsd b/plugins/org.eclipse.wst.server.ui/schema/editorPageSections.exsd
index f98b295..601e0a7 100644
--- a/plugins/org.eclipse.wst.server.ui/schema/editorPageSections.exsd
+++ b/plugins/org.eclipse.wst.server.ui/schema/editorPageSections.exsd
@@ -54,14 +54,14 @@
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
- specifies a unique identifier for this extension point
+ specifies a unique identifier for this section
</documentation>
</annotation>
</attribute>
<attribute name="class" type="string" use="required">
<annotation>
<documentation>
- specifies the fully qualified name of the Java class that implements <samp>org.eclipse.wst.server.ui.editor.IServerEditorSection</samp>.
+ specifies the fully qualified name of the Java class that implements <samp>org.eclipse.wst.server.ui.editor.IServerEditorSection</samp>
</documentation>
<appInfo>
<meta.attribute kind="java" basedOn="org.eclipse.wst.server.ui.editor.IServerEditorSection"/>
@@ -71,21 +71,21 @@
<attribute name="typeIds" type="string">
<annotation>
<documentation>
-
+ a comma separated list of server type ids. May include wildcards (*) at the end of an id
</documentation>
</annotation>
</attribute>
<attribute name="order" type="string">
<annotation>
<documentation>
-
+ an integer that specifies an absolute ordering of the section relative to other sections
</documentation>
</annotation>
</attribute>
<attribute name="insertionId" type="string">
<annotation>
<documentation>
-
+ the editor page insertion id that this section should be inserted into
</documentation>
</annotation>
</attribute>
@@ -130,7 +130,7 @@
Value of the attribute <b>class</b> must be a fully qualified name of a Java class that implements the interface <code>org.eclipse.wst.server.ui.editor.ServerEditorPageSectionFactoryDelegate</code>.
</documentation>
</annotation>
-
+
<annotation>
<appInfo>
<meta.section type="implementation"/>
diff --git a/plugins/org.eclipse.wst.server.ui/schema/editorPages.exsd b/plugins/org.eclipse.wst.server.ui/schema/editorPages.exsd
index 961642c..62df421 100644
--- a/plugins/org.eclipse.wst.server.ui/schema/editorPages.exsd
+++ b/plugins/org.eclipse.wst.server.ui/schema/editorPages.exsd
@@ -54,14 +54,14 @@
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
- specifies a unique identifier for this extension point
+ specifies a unique identifier for this page
</documentation>
</annotation>
</attribute>
<attribute name="class" type="string" use="required">
<annotation>
<documentation>
- specifies the fully qualified name of the Java class that implements <samp>org.eclipse.ui.IEditorPart</samp>.
+ specifies the fully qualified name of the Java class that implements <samp>org.eclipse.ui.IEditorPart</samp>
</documentation>
<appInfo>
<meta.attribute kind="java" basedOn="org.eclipse.ui.IEditorPart"/>
@@ -71,7 +71,7 @@
<attribute name="name" type="string" use="required">
<annotation>
<documentation>
-
+ a translatable name used to identify this page
</documentation>
<appInfo>
<meta.attribute translatable="true"/>
@@ -81,21 +81,21 @@
<attribute name="typeIds" type="string" use="required">
<annotation>
<documentation>
-
+ a comma separated list of server type ids. May include wildcards (*) at the end of an id
</documentation>
</annotation>
</attribute>
<attribute name="order" type="string">
<annotation>
<documentation>
-
+ an integer that specifies an absolute ordering of the page relative to other pages
</documentation>
</annotation>
</attribute>
<attribute name="insertionIds" type="string">
<annotation>
<documentation>
-
+ a comma separated list of insertion ids that allow sections to be plugged in
</documentation>
</annotation>
</attribute>
@@ -140,7 +140,7 @@
Value of the attribute <b>class</b> must be a fully qualified name of a Java class that implements the interface <code>org.eclipse.wst.server.ui.editor.ServerEditorPartFactoryDelegate</code>.
</documentation>
</annotation>
-
+
<annotation>
<appInfo>
<meta.section type="implementation"/>
diff --git a/plugins/org.eclipse.wst.server.ui/schema/serverImages.exsd b/plugins/org.eclipse.wst.server.ui/schema/serverImages.exsd
index 58b2f95..ea0b38d 100644
--- a/plugins/org.eclipse.wst.server.ui/schema/serverImages.exsd
+++ b/plugins/org.eclipse.wst.server.ui/schema/serverImages.exsd
@@ -51,14 +51,14 @@
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
- specifies a unique identifier for this extension point
+ specifies a unique identifier for this image
</documentation>
</annotation>
</attribute>
<attribute name="icon" type="string" use="required">
<annotation>
<documentation>
-
+ a bundle-relative path to the icon image
</documentation>
<appInfo>
<meta.attribute kind="resource"/>
@@ -68,7 +68,7 @@
<attribute name="typeIds" type="string" use="required">
<annotation>
<documentation>
-
+ a comma separated list of runtime or server type ids
</documentation>
</annotation>
</attribute>
@@ -111,7 +111,7 @@
</documentation>
</annotation>
-
+
<annotation>
<appInfo>
<meta.section type="implementation"/>
diff --git a/plugins/org.eclipse.wst.server.ui/schema/wizardFragments.exsd b/plugins/org.eclipse.wst.server.ui/schema/wizardFragments.exsd
index 91a2734..65bcb2f 100644
--- a/plugins/org.eclipse.wst.server.ui/schema/wizardFragments.exsd
+++ b/plugins/org.eclipse.wst.server.ui/schema/wizardFragments.exsd
@@ -51,14 +51,14 @@
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
- specifies a unique identifier for this extension point
+ specifies a unique identifier for this fragment
</documentation>
</annotation>
</attribute>
<attribute name="class" type="string" use="required">
<annotation>
<documentation>
- specifies the fully qualified name of the Java class that implements <samp>org.eclipse.wst.server.ui.wizard.WizardFragment</samp>.
+ specifies the fully qualified name of the Java class that implements <samp>org.eclipse.wst.server.ui.wizard.WizardFragment</samp>
</documentation>
<appInfo>
<meta.attribute kind="java" basedOn="org.eclipse.wst.server.ui.wizard.WizardFragment"/>
@@ -68,7 +68,7 @@
<attribute name="typeIds" type="string" use="required">
<annotation>
<documentation>
-
+ a comma separated list of runtime or server type ids that this fragment applies to
</documentation>
</annotation>
</attribute>
@@ -111,7 +111,7 @@
Value of the attribute <b>class</b> must be a fully qualified name of a Java class that implements the interface <code>org.eclipse.wst.server.ui.wizard.WizardFragment</code>.
</documentation>
</annotation>
-
+
<annotation>
<appInfo>
<meta.section type="implementation"/>
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/RuntimePreferencePage.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/RuntimePreferencePage.java
index 322f5a2..deb3304 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/RuntimePreferencePage.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/RuntimePreferencePage.java
@@ -94,6 +94,7 @@
label = new Label(composite, SWT.WRAP);
data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
data.horizontalSpan = 2;
+ data.verticalIndent = 5;
label.setLayoutData(data);
label.setText(Messages.preferenceRuntimesTable);
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ServerEditorActionFactoryDelegate.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ServerEditorActionFactoryDelegate.java
index d60a390..477adda 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ServerEditorActionFactoryDelegate.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/provisional/ServerEditorActionFactoryDelegate.java
@@ -16,8 +16,7 @@
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.ui.editor.IServerEditorPartInput;
/**
- *
- * @plannedfor 1.0
+ *
*/
public abstract class ServerEditorActionFactoryDelegate {
/**