WebServer -> BuiltInServer

platform/platform-api/src/org/jetbrains/ide/BuiltInServerManager.java

@@ -20,17 +20,17 @@ import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class WebServerManager {
+public abstract class BuiltInServerManager {
   // Your handler will be instantiated on first user request
   public static final ExtensionPointName<HttpRequestHandler> EP_NAME = ExtensionPointName.create("com.intellij.httpRequestHandler");
 
-  public static WebServerManager getInstance() {
-    return ServiceManager.getService(WebServerManager.class);
+  public static BuiltInServerManager getInstance() {
+    return ServiceManager.getService(BuiltInServerManager.class);
   }
 
   public abstract int getPort();
 
-  public abstract WebServerManager waitForStart();
+  public abstract BuiltInServerManager waitForStart();
 
   @Nullable
   public abstract Disposable getServerDisposable();

platform/platform-impl/src/org/jetbrains/ide/BuiltInServerManagerImpl.java

@@ -24,8 +24,8 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class WebServerManagerImpl extends WebServerManager {
-  private static final Logger LOG = Logger.getInstance(WebServerManager.class);
+public class BuiltInServerManagerImpl extends BuiltInServerManager {
+  private static final Logger LOG = Logger.getInstance(BuiltInServerManager.class);
 
   @NonNls
   public static final String PROPERTY_RPC_PORT = "rpc.port";
@@ -45,7 +45,7 @@ public class WebServerManagerImpl extends WebServerManager {
   }
 
   @Override
-  public WebServerManager waitForStart() {
+  public BuiltInServerManager waitForStart() {
     Future<?> serverStartFuture = startServerInPooledThread();
     if (serverStartFuture != null) {
       LOG.assertTrue(!ApplicationManager.getApplication().isDispatchThread());
@@ -74,9 +74,9 @@ public class WebServerManagerImpl extends WebServerManager {
       }
 
       veryFirstProjectOpening = false;
-      WebServerManager webServerManager = WebServerManager.getInstance();
-      if (webServerManager instanceof WebServerManagerImpl) {
-        ((WebServerManagerImpl)webServerManager).startServerInPooledThread();
+      BuiltInServerManager builtInServerManager = BuiltInServerManager.getInstance();
+      if (builtInServerManager instanceof BuiltInServerManagerImpl) {
+        ((BuiltInServerManagerImpl)builtInServerManager).startServerInPooledThread();
       }
     }
   }

platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandler.java

@@ -24,7 +24,7 @@ import org.jboss.netty.channel.*;
 import org.jboss.netty.handler.codec.http.HttpRequest;
 import org.jboss.netty.handler.codec.http.QueryStringDecoder;
 import org.jetbrains.ide.HttpRequestHandler;
-import org.jetbrains.ide.WebServerManager;
+import org.jetbrains.ide.BuiltInServerManager;
 
 import javax.swing.*;
 import java.awt.image.BufferedImage;
@@ -69,7 +69,7 @@ final class DelegatingHttpRequestHandler extends SimpleChannelUpstreamHandler {
       return;
     }
 
-    for (HttpRequestHandler handler : WebServerManager.EP_NAME.getExtensions()) {
+    for (HttpRequestHandler handler : BuiltInServerManager.EP_NAME.getExtensions()) {
       try {
         if (handler.isSupported(request) && handler.process(urlDecoder, request, context)) {
           if (context.getAttachment() == null) {

plugins/git4idea/src/git4idea/rebase/GitRebaseEditorService.java

@@ -26,7 +26,7 @@ import org.apache.xmlrpc.XmlRpcClientLite;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.git4idea.util.ScriptGenerator;
-import org.jetbrains.ide.WebServerManager;
+import org.jetbrains.ide.BuiltInServerManager;
 
 import java.util.Map;
 import java.util.Random;
@@ -89,7 +89,7 @@ public class GitRebaseEditorService {
     synchronized (myScriptLock) {
       if (myEditorCommand == null) {
         ScriptGenerator generator = new ScriptGenerator(GIT_REBASE_EDITOR_PREFIX, GitRebaseEditorMain.class);
-        generator.addInternal(Integer.toString(WebServerManager.getInstance().getPort()));
+        generator.addInternal(Integer.toString(BuiltInServerManager.getInstance().getPort()));
         generator.addClasses(XmlRpcClientLite.class, DecoderException.class);
         myEditorCommand = generator.commandLine();
       }

plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitXmlRpcHandlerService.java

@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.git4idea.GitExternalApp;
 import org.jetbrains.git4idea.util.ScriptGenerator;
-import org.jetbrains.ide.WebServerManager;
+import org.jetbrains.ide.BuiltInServerManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -74,7 +74,7 @@ public abstract class GitXmlRpcHandlerService<T> {
    * @return the port number for XML RCP
    */
   public int getXmlRcpPort() {
-    return WebServerManager.getInstance().waitForStart().getPort();
+    return BuiltInServerManager.getInstance().waitForStart().getPort();
   }
 
   /**

plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java

@@ -32,8 +32,8 @@ import git4idea.test.GitExecutor;
 import git4idea.test.GitTestInitUtil;
 import git4idea.test.TestNotificator;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.ide.WebServerManager;
-import org.jetbrains.ide.WebServerManagerImpl;
+import org.jetbrains.ide.BuiltInServerManager;
+import org.jetbrains.ide.BuiltInServerManagerImpl;
 import org.junit.Assert;
 import org.picocontainer.MutablePicoContainer;
 
@@ -153,9 +153,9 @@ public class GitCucumberWorld {
   @Before("@remote")
   @Order(1)
   public void setUpRemoteOperations() {
-    ((WebServerManagerImpl)WebServerManager.getInstance()).setEnabledInUnitTestMode(true);
+    ((BuiltInServerManagerImpl)BuiltInServerManager.getInstance()).setEnabledInUnitTestMode(true);
     // default port will be occupied by main idea instance => define the custom default to avoid searching of free port
-    System.setProperty(WebServerManagerImpl.PROPERTY_RPC_PORT, "64463");
+    System.setProperty(BuiltInServerManagerImpl.PROPERTY_RPC_PORT, "64463");
     myHttpAuthService = (GitHttpAuthTestService)ServiceManager.getService(GitHttpAuthService.class);
   }
 
@@ -170,7 +170,7 @@ public class GitCucumberWorld {
   @After("@remote")
   @Order(1)
   public void tearDownRemoteOperations() {
-    ((WebServerManagerImpl)WebServerManager.getInstance()).setEnabledInUnitTestMode(false);
+    ((BuiltInServerManagerImpl)BuiltInServerManager.getInstance()).setEnabledInUnitTestMode(false);
   }
 
   @After