[570039] Tomcat "download and install" should be enabled on macOS
Also update and clean up the discovery sites
Signed-off-by: Nitin Dahyabhai <thatnitind@gmail.com>
diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/feature.properties b/features/org.eclipse.jst.server_adapters.ext.feature/feature.properties
index 71986f6..49df949 100644
--- a/features/org.eclipse.jst.server_adapters.ext.feature/feature.properties
+++ b/features/org.eclipse.jst.server_adapters.ext.feature/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2019 IBM Corporation and others.
+# Copyright (c) 2006, 2021 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
@@ -17,14 +17,14 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=JST Server Adapters Extensions
+featureName=JST Server Adapters Extensions (Apache Tomcat)
# "providerName" property - name of the company that provides the feature
providerName=Eclipse Web Tools Platform
# "description" property - description of the feature
-description=Provides the Apache Tomcat and ObjectWeb JOnAS server adapters
+description=Provides the Apache Tomcat server adapter
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml b/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml
index 3e14d2b..711b884 100644
--- a/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml
+++ b/features/org.eclipse.jst.server_adapters.ext.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.jst.server_adapters.ext.feature"
label="%featureName"
- version="3.3.900.qualifier"
+ version="3.4.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
@@ -45,10 +45,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.jst.server.generic.jonas"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
</feature>
diff --git a/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml b/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml
index dc88428..1fc3a62 100644
--- a/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml
+++ b/features/org.eclipse.jst.server_adapters.ext.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.jst.server_adapters.ext.feature</artifactId>
- <version>3.3.900-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.wst.server_core.feature/feature.xml b/features/org.eclipse.wst.server_core.feature/feature.xml
index ad3dff8..9d98ee7 100644
--- a/features/org.eclipse.wst.server_core.feature/feature.xml
+++ b/features/org.eclipse.wst.server_core.feature/feature.xml
@@ -15,7 +15,7 @@
<feature
id="org.eclipse.wst.server_core.feature"
label="%featureName"
- version="3.3.800.qualifier"
+ version="3.3.900.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.server_core.feature/pom.xml b/features/org.eclipse.wst.server_core.feature/pom.xml
index 70e9c01..c6ff39a 100644
--- a/features/org.eclipse.wst.server_core.feature/pom.xml
+++ b/features/org.eclipse.wst.server_core.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.wst.server_core.feature</artifactId>
- <version>3.3.800-SNAPSHOT</version>
+ <version>3.3.900-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.wst.server_ui.feature/feature.xml b/features/org.eclipse.wst.server_ui.feature/feature.xml
index 4909253..d2724cb 100644
--- a/features/org.eclipse.wst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.server_ui.feature/feature.xml
@@ -15,7 +15,7 @@
<feature
id="org.eclipse.wst.server_ui.feature"
label="%featureName"
- version="3.3.900.qualifier"
+ version="3.3.1000.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.server_ui.feature/pom.xml b/features/org.eclipse.wst.server_ui.feature/pom.xml
index 1b294a7..19ad5f6 100644
--- a/features/org.eclipse.wst.server_ui.feature/pom.xml
+++ b/features/org.eclipse.wst.server_ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.wst.server_ui.feature</artifactId>
- <version>3.3.900-SNAPSHOT</version>
+ <version>3.3.1000-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/AddTomcat.md b/plugins/org.eclipse.jst.server.tomcat.core/AddTomcat.md
index cfc24b3..b4f5ccc 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/AddTomcat.md
+++ b/plugins/org.eclipse.jst.server.tomcat.core/AddTomcat.md
@@ -38,4 +38,8 @@
1. Modify **plugin.xml** to add new configuration elements.
1. Add a new **image** to the **org.eclipse.wst.server.ui.serverImages** extension for new runtime and server ids.
- 2. Add a new **fragment** to the **org.eclipse.wst.server.ui.wizardFragments** extension.
\ No newline at end of file
+ 2. Add a new **fragment** to the **org.eclipse.wst.server.ui.wizardFragments** extension.
+
+### Determining values for installable runtimes:
+ 1. For ostype linux: filecount = tar tvzf apache-tomcat-8.0.53.tar.gz|grep -v '\/$'|wc -l
+ 1. For ostype win32: filecount = unzip -l apache-tomcat-8.0.36-windows-x86.zip|grep -v '\/$'|grep 'apache-tomcat-8.0.36/'|wc -l
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
index aa2ff97..fb09adc 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.tomcat.core; singleton:=true
-Bundle-Version: 1.1.1100.qualifier
+Bundle-Version: 1.1.1200.qualifier
Bundle-Activator: org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
index 4fc9764..38f635d 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
@@ -655,7 +655,7 @@
licenseUrl="http://www.apache.org/licenses/LICENSE-1.1"
archiveUrl="http://archive.apache.org/dist/tomcat/tomcat-3/archive/v3.2.4/bin/jakarta-tomcat-3.2.4.tar.gz"
archivePath="jakarta-tomcat-3.2.4"
- os="linux"/>
+ os="linux,macosx"/>
<runtime
id="org.eclipse.jst.server.tomcat.runtime.40"
licenseUrl="http://www.apache.org/licenses/LICENSE-1.1"
@@ -667,7 +667,7 @@
licenseUrl="http://www.apache.org/licenses/LICENSE-1.1"
archiveUrl="http://archive.apache.org/dist/tomcat/tomcat-4/archive/v4.0.6/bin/jakarta-tomcat-4.0.6.tar.gz"
archivePath="jakarta-tomcat-4.0.6"
- os="linux"/>
+ os="linux,macosx"/>
<runtime
id="org.eclipse.jst.server.tomcat.runtime.41"
licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -683,7 +683,7 @@
archivePath="apache-tomcat-4.1.40"
archiveSize="9358737"
fileCount="1425"
- os="linux"/>
+ os="linux,macosx"/>
<runtime
id="org.eclipse.jst.server.tomcat.runtime.50"
licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -695,7 +695,7 @@
licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
archiveUrl="http://archive.apache.org/dist/tomcat/tomcat-5/v5.0.28/bin/jakarta-tomcat-5.0.28.tar.gz"
archivePath="jakarta-tomcat-5.0.28"
- os="linux"/>
+ os="linux,macosx"/>
<runtime
id="org.eclipse.jst.server.tomcat.runtime.55"
licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -711,7 +711,7 @@
archivePath="apache-tomcat-5.5.33"
archiveSize="8205713"
fileCount="840"
- os="linux"/>
+ os="linux,macosx"/>
<runtime
id="org.eclipse.jst.server.tomcat.runtime.60"
licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -727,7 +727,7 @@
archivePath="apache-tomcat-6.0.37"
archiveSize="6885442"
fileCount="492"
- os="linux"/>
+ os="linux,macosx"/>
<runtime
id="org.eclipse.jst.server.tomcat.runtime.70"
licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -743,7 +743,7 @@
archivePath="apache-tomcat-7.0.47"
archiveSize="8234674"
fileCount="629"
- os="linux"/>
+ os="linux,macosx"/>
<runtime
id="org.eclipse.jst.server.tomcat.runtime.80"
licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -755,10 +755,43 @@
<runtime
id="org.eclipse.jst.server.tomcat.runtime.80"
licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
- archiveUrl="http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.36/bin/apache-tomcat-8.0.36.tar.gz"
- archivePath="apache-tomcat-8.0.36"
- archiveSize="9277365"
- fileCount="641"
- os="linux"/>
+ archiveUrl="http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.53/bin/apache-tomcat-8.0.53.tar.gz"
+ archivePath="apache-tomcat-8.0.53"
+ archiveSize="9455895"
+ fileCount="643"
+ os="linux,macosx"/>
+ <runtime
+ id="org.eclipse.jst.server.tomcat.runtime.85"
+ licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
+ archiveUrl="http://archive.apache.org/dist/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61.tar.gz"
+ archivePath="apache-tomcat-8.5.61"
+ archiveSize="10492067"
+ fileCount="625"
+ os="linux,macosx"/>
+ <runtime
+ id="org.eclipse.jst.server.tomcat.runtime.85"
+ licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
+ archiveUrl="http://archive.apache.org/dist/tomcat/tomcat-8/v8.5.61/bin/apache-tomcat-8.5.61-windows-x86.zip"
+ archivePath="apache-tomcat-8.5.61"
+ archiveSize="11538389"
+ fileCount="627"
+ os="win32"/>
+ <runtime
+ id="org.eclipse.jst.server.tomcat.runtime.90"
+ licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
+ archiveUrl="http://archive.apache.org/dist/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.tar.gz"
+ archivePath="apache-tomcat-9.0.41"
+ archiveSize="11442169"
+ fileCount="639"
+ os="linux,macosx"/>
+ <runtime
+ id="org.eclipse.jst.server.tomcat.runtime.90"
+ licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
+ archiveUrl="http://archive.apache.org/dist/tomcat/tomcat-9/v9.0.41/bin/apache-tomcat-9.0.41.zip"
+ archivePath="apache-tomcat-9.0.41"
+ archiveSize="11983597"
+ fileCount="639"
+ os="win32"/>
+
</extension>
</plugin>
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/pom.xml b/plugins/org.eclipse.jst.server.tomcat.core/pom.xml
index bec18b6..fb20a65 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/pom.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.jst.server.tomcat.core</artifactId>
- <version>1.1.1100-SNAPSHOT</version>
+ <version>1.1.1200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
index 2081016..d4e1228 100644
--- a/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.server.core; singleton:=true
-Bundle-Version: 1.10.100.qualifier
+Bundle-Version: 1.10.200.qualifier
Bundle-Activator: org.eclipse.wst.server.core.internal.ServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.server.core/pom.xml b/plugins/org.eclipse.wst.server.core/pom.xml
index 1f5bebf..1a504d1 100644
--- a/plugins/org.eclipse.wst.server.core/pom.xml
+++ b/plugins/org.eclipse.wst.server.core/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.wst.server.core</artifactId>
- <version>1.10.100-SNAPSHOT</version>
+ <version>1.10.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/RuntimeBridge.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/RuntimeBridge.java
index 9457426..0ad667a 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/RuntimeBridge.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/RuntimeBridge.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007,2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2021 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -72,8 +72,6 @@
// generic runtimes
addMapping("org.eclipse.jst.server.generic.runtime.jboss323", "org.eclipse.jst.server.generic.runtime.jboss", "3.2.3");
- addMapping("org.eclipse.jst.server.generic.runtime.jonas4", "org.eclipse.jst.server.generic.runtime.jonas", "4.0");
-
addMapping("org.eclipse.jst.server.generic.runtime.oracle1013", "org.eclipse.jst.server.generic.runtime.oracle", "10.1.3");
}
@@ -176,4 +174,4 @@
return null;
}
}
-}
\ No newline at end of file
+}
diff --git a/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF
index d970269..b42268f 100644
--- a/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %bundleName
Bundle-Vendor: %bundleVendor
Bundle-SymbolicName: org.eclipse.wst.server.discovery;singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.300.qualifier
Bundle-Activator: org.eclipse.wst.server.discovery.internal.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0)",
diff --git a/plugins/org.eclipse.wst.server.discovery/pom.xml b/plugins/org.eclipse.wst.server.discovery/pom.xml
index f9a80e0..19406b7 100644
--- a/plugins/org.eclipse.wst.server.discovery/pom.xml
+++ b/plugins/org.eclipse.wst.server.discovery/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.wst.server.discovery</artifactId>
- <version>1.3.200-SNAPSHOT</version>
+ <version>1.3.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml b/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml
index 7ea166a..ac6b5e7 100644
--- a/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml
+++ b/plugins/org.eclipse.wst.server.discovery/serverAdapterSites.xml
@@ -1,11 +1,9 @@
<extensions>
<site url="http://www.apache.org/dist/geronimo/eclipse/updates/"/>
- <site url="http://www.pramati.com/downloads/eclipse/updates/"/>
<site url="http://master.dl.sourceforge.net/project/sapnweclipse/updates/"/>
- <site url="http://jope.ow2.org/update/jope/"/>
<site url="http://download.eclipse.org/jetty/updates/jetty-wtp/"/>
<site url="http://www.caucho.com/eclipse/"/>
<site url="http://download.jboss.org/jbosstools/updates/webtools/photon/"/>
- <site url="http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/libertyAdapter/2019-06/"/>
+ <site url="http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/libertyAdapter/2020-09/"/>
<site url="http://download.oracle.com/otn_software/oepe/oxygen/"/>
</extensions>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.preview/.classpath b/plugins/org.eclipse.wst.server.preview/.classpath
index 304e861..eca7bdb 100644
--- a/plugins/org.eclipse.wst.server.preview/.classpath
+++ b/plugins/org.eclipse.wst.server.preview/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.wst.server.preview/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.server.preview/.settings/org.eclipse.jdt.core.prefs
index 2920850..cba5ccb 100644
--- a/plugins/org.eclipse.wst.server.preview/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.server.preview/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Thu Sep 13 15:25:06 EDT 2007
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
@@ -10,9 +9,9 @@
org.eclipse.jdt.core.classpath.exclusionPatterns=disabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,6 +71,7 @@
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.incompatibleJDKLevel=warning
org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerLabelProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerLabelProvider.java
index 5464d49..24bc889 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerLabelProvider.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerLabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2013 IBM Corporation and others.
+ * Copyright (c) 2003, 2021 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -30,7 +30,6 @@
import org.eclipse.wst.server.core.*;
import org.eclipse.wst.server.core.internal.IClient;
-import org.eclipse.wst.server.ui.internal.Trace;
import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer;
/**
* A label provider for all server related objects.
