[138705] Fix schema
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 {
/**