[228240] Server timeout
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java
index ed74363..989dbb0 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/PingThread.java
@@ -14,7 +14,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.internal.ServerType;
+import org.eclipse.wst.server.core.internal.Server;
 import org.eclipse.wst.server.core.util.SocketUtil;
 
 /**
@@ -61,7 +61,7 @@
 	private int guessMaxPings(GenericServerBehaviour server)
     {
     	int maxpings=-1;
-    	int startTimeout = ((ServerType)server.getServer().getServerType()).getStartTimeout();
+    	int startTimeout = ((Server)server.getServer()).getStartTimeout() * 1000;
     	if(startTimeout>0)
     		maxpings=startTimeout/PING_INTERVAL;
     	return maxpings;
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java
index 1d5461c..e03d835 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java
@@ -17,7 +17,7 @@
 
 import org.eclipse.jst.server.preview.adapter.internal.Trace;
 import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.internal.ServerType;
+import org.eclipse.wst.server.core.internal.Server;
 /**
  * Thread used to ping server to test when it is started.
  */
@@ -59,7 +59,7 @@
 	}
 
 	private int guessMaxPings() {
-		int startTimeout = ((ServerType) server.getServerType()).getStartTimeout();
+		int startTimeout = ((Server)server).getStartTimeout() * 1000;
 		if (startTimeout > 0)
 			return startTimeout / PING_INTERVAL;
 		return -1;
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PingThread.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PingThread.java
index 55585d0..546a0dd 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PingThread.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PingThread.java
@@ -16,7 +16,7 @@
 import java.net.URLConnection;
 
 import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.internal.ServerType;
+import org.eclipse.wst.server.core.internal.Server;
 /**
  * Thread used to ping server to test when it is started.
  */
@@ -58,7 +58,7 @@
 	}
 
 	private int guessMaxPings() {
-		int startTimeout = ((ServerType) server.getServerType()).getStartTimeout();
+		int startTimeout = ((Server)server).getStartTimeout() * 1000;
 		if (startTimeout > 0)
 			return startTimeout / PING_INTERVAL;
 		return -1;
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java
index 3a00449..5d09bdc 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java
@@ -278,12 +278,11 @@
 
 			public void run() {
 				while (alive) {
-					ServerType serverType = (ServerType) server.getServerType();
-					int delay = serverType.getStartTimeout();
+					int delay = server.getStartTimeout() * 1000;
 					if (mode == 1)
-						delay = serverType.getStopTimeout();
+						delay = server.getStopTimeout() * 1000;
 					else if (mode == 2)
-						delay += serverType.getStopTimeout();
+						delay += server.getStopTimeout() * 1000;
 					
 					if (delay < 0)
 						return;