Revision: 6768 Author: [email protected] Date: Mon Nov 9 09:38:13 2009 Log: Merges tr...@r6767 into releases/2.0. Merge performed with the following command:
svn merge --ignore-ancestry -c 6762 https://google-web-toolkit.googlecode.com/svn/trunk . http://code.google.com/p/google-web-toolkit/source/detail?r=6768 Modified: /releases/2.0/dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java /releases/2.0/dev/core/src/com/google/gwt/dev/shell/remoteui/DevModeServiceRequestProcessor.java /releases/2.0/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteUI.java /releases/2.0/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java Fri Oct 16 20:54:44 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java Mon Nov 9 09:38:13 2009 @@ -169,7 +169,7 @@ ModuleSpace moduleSpace = new ModuleSpaceOOPHM(msh, moduleName, serverChannel); moduleMap.put(serverChannel, moduleSpace); - moduleSpace.onLoad(loadModuleLogger); + moduleSpace.onLoad(logger); } catch (Throwable e) { // We do catch Throwable intentionally because there are a ton of things // that can go wrong trying to load a module, including Error-derived ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/shell/remoteui/DevModeServiceRequestProcessor.java Wed Nov 4 06:59:39 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/shell/remoteui/DevModeServiceRequestProcessor.java Mon Nov 9 09:38:13 2009 @@ -89,7 +89,10 @@ } private Response processRestartServer() { - remoteUI.restartWebServer(); + if (!remoteUI.restartWebServer()) { + throw new IllegalStateException( + "Unable to restart the web server. This server may not have the capability to be restarted."); + } DevModeResponse.Builder devModeResponseBuilder = DevModeResponse.newBuilder(); devModeResponseBuilder.setResponseType(DevModeResponse.ResponseType.RESTART_WEB_SERVER); ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteUI.java Fri Oct 30 11:06:32 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteUI.java Mon Nov 9 09:38:13 2009 @@ -39,8 +39,6 @@ private final String clientId; private final DevModeServiceRequestProcessor devModeRequestProcessor; private final MessageTransport transport; - private ViewerServiceTreeLogger webServerLogger = null; - private ViewerServiceTreeLogger mainLogger = null; private ViewerServiceClient viewerServiceClient = null; private final int webServerPort; private final int browserChannelPort; @@ -62,32 +60,10 @@ throw new RuntimeException(e); } } - - @Override - public TreeLogger getTopLogger() { - if (mainLogger != null) { - return mainLogger; - } - - mainLogger = new ViewerServiceTreeLogger(viewerServiceClient); - int topLoggerHandle = viewerServiceClient.addMainLog(); - mainLogger.setLogHandle(topLoggerHandle); - mainLogger.setMaxDetail(getLogLevel()); - return mainLogger; - } @Override public TreeLogger getWebServerLogger(String serverName, byte[] serverIcon) { - if (webServerLogger != null) { - return webServerLogger; - } - - webServerLogger = new ViewerServiceTreeLogger(viewerServiceClient); - int webServerLoggerHandle = viewerServiceClient.addServerLog(serverName, - serverIcon); - webServerLogger.setLogHandle(webServerLoggerHandle); - webServerLogger.setMaxDetail(getLogLevel()); - return webServerLogger; + return getConsoleLogger(); } @Override @@ -138,10 +114,18 @@ return handle; } - public void restartWebServer() { - if (supportsRestartWebServer() && webServerLogger != null) { - ((RestartServerCallback) getCallback(RestartServerEvent.getType())).onRestartServer(webServerLogger); - } + public boolean restartWebServer() { + if (!supportsRestartWebServer()) { + return false; + } + + TreeLogger webServerLogger = getConsoleLogger(); + if (webServerLogger == null) { + return false; + } + + ((RestartServerCallback) getCallback(RestartServerEvent.getType())).onRestartServer(webServerLogger); + return true; } public boolean supportsRestartWebServer() { ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java Mon Nov 9 08:06:34 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java Mon Nov 9 09:38:13 2009 @@ -121,22 +121,6 @@ Future<Response> responseFuture = transport.executeRequestAsync(requestMessage); waitForResponse(responseFuture); } - - /** - * Add a new MAIN logger. Typically, this method should only be called once - * (as there is only one MAIN logger). - * - * @return the log handle for the newly-created MAIN logger - */ - public int addMainLog() { - ViewerRequest.AddLog.MainLog.Builder mainLogBuilder = ViewerRequest.AddLog.MainLog.newBuilder(); - - ViewerRequest.AddLog.Builder addLogBuilder = ViewerRequest.AddLog.newBuilder(); - addLogBuilder.setType(ViewerRequest.AddLog.LogType.MAIN); - addLogBuilder.setMainLog(mainLogBuilder); - - return createLogger(addLogBuilder); - } /** * Add a new Module logger. This method should not be called multiple times @@ -182,31 +166,6 @@ return createLogger(addLogBuilder); } - - /** - * Add a new Web Server logger. Typically, this method should only be called - * once, as there is only one Web Server tunning at a time. - * - * @param serverName short name of the web server or null if only the icon - * should be used - * @param serverIcon byte array containing an icon (fitting into 24x24) to use - * for the server, or null if only the name should be used - * @return the log handle for the newly-created Module logger - */ - public int addServerLog(String serverName, byte[] serverIcon) { - ViewerRequest.AddLog.ServerLog.Builder serverLogBuilder = ViewerRequest.AddLog.ServerLog.newBuilder(); - serverLogBuilder.setName(serverName); - - if (serverIcon != null) { - serverLogBuilder = serverLogBuilder.setIcon(ByteString.copyFrom(serverIcon)); - } - - ViewerRequest.AddLog.Builder addLogBuilder = ViewerRequest.AddLog.newBuilder(); - addLogBuilder.setType(ViewerRequest.AddLog.LogType.WEB_SERVER); - addLogBuilder.setServerLog(serverLogBuilder); - - return createLogger(addLogBuilder); - } /** * Check the capabilities of the ViewerService. Ensures that the ViewerService --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
