Author: plessy
Date: 2011-08-24 02:29:27 +0000 (Wed, 24 Aug 2011)
New Revision: 145
Modified:
gwt/trunk/debian/patches/exclude-tomcat.patch
Log:
Ported the patch to version 2.4.0, using deletions instead of commenting.
Also added DEP 3 header.
Modified: gwt/trunk/debian/patches/exclude-tomcat.patch
===================================================================
--- gwt/trunk/debian/patches/exclude-tomcat.patch 2011-08-24 01:47:43 UTC (rev 144)
+++ gwt/trunk/debian/patches/exclude-tomcat.patch 2011-08-24 02:29:27 UTC (rev 145)
@@ -1,8 +1,11 @@
-diff -Nur -x '*.orig' -x '*~' gwt-1.6.4/dev/core/build.xml gwt-1.6.4.new/dev/core/build.xml
---- gwt-1.6.4/dev/core/build.xml 2009-07-20 11:26:45.000000000 +0200
-+++ gwt-1.6.4.new/dev/core/build.xml 2009-07-20 11:27:53.000000000 +0200
-@@ -24,7 +24,7 @@
- <mkdir dir="${project.build}" />
+Description: Prevents embedded Tomcat server to start.
+Author: Thierry Carrez <thierry.carrez at ubuntu.com>
+Forwarded: no
+
+--- a/dev/build.xml
++++ b/dev/build.xml
+@@ -118,7 +118,7 @@
+ </outofdate>
</target>
- <property name="filter.pattern" value="com/google/gwt/dev/About.properties" />
@@ -10,45 +13,39 @@
<target name="-filter.props" description="Creates filtered About.properties with version info"
unless="filter.uptodate">
-diff -Nur -x '*.orig' -x '*~' gwt-1.6.4/dev/core/src/com/google/gwt/dev/GWTShell.java gwt-1.6.4.new/dev/core/src/com/google/gwt/dev/GWTShell.java
---- gwt-1.6.4/dev/core/src/com/google/gwt/dev/GWTShell.java 2009-07-20 11:25:02.000000000 +0200
-+++ gwt-1.6.4.new/dev/core/src/com/google/gwt/dev/GWTShell.java 2009-07-20 11:26:47.000000000 +0200
-@@ -23,7 +23,7 @@
+--- a/dev/core/src/com/google/gwt/dev/GWTShell.java
++++ b/dev/core/src/com/google/gwt/dev/GWTShell.java
+@@ -22,7 +22,6 @@ import com.google.gwt.core.ext.linker.EmittedArtifact.Visibility;
+ import com.google.gwt.core.ext.linker.impl.StandardLinkerContext;
import com.google.gwt.dev.cfg.ModuleDef;
- import com.google.gwt.dev.shell.ArtifactAcceptor;
import com.google.gwt.dev.shell.WorkDirs;
-import com.google.gwt.dev.shell.tomcat.EmbeddedTomcatServer;
-+//import com.google.gwt.dev.shell.tomcat.EmbeddedTomcatServer;
- import com.google.gwt.dev.util.Util;
+ import com.google.gwt.dev.util.OutputFileSetOnDirectory;
+ import com.google.gwt.dev.util.arg.ArgHandlerDisableUpdateCheck;
import com.google.gwt.dev.util.arg.ArgHandlerOutDir;
- import com.google.gwt.util.tools.ArgHandlerExtra;
-@@ -217,22 +217,22 @@
+@@ -195,7 +194,6 @@ public class GWTShell extends DevModeBase {
protected void doShutDownServer() {
// Stop the HTTP server.
//
- EmbeddedTomcatServer.stop();
-+ //EmbeddedTomcatServer.stop();
}
@Override
- protected int doStartUpServer() {
- // TODO(bruce): make tomcat work in terms of the modular launcher
-- String whyFailed = EmbeddedTomcatServer.start(getTopLogger(), getPort(),
-- options);
-+ //String whyFailed = EmbeddedTomcatServer.start(getTopLogger(), getPort(),
-+ // options);
+@@ -206,17 +204,7 @@ public class GWTShell extends DevModeBase {
- // TODO(bruce): test that we can remove this old approach in favor of
- // a better, logger-based error reporting
+ @Override
+ protected int doStartUpServer() {
+- // TODO(jat): find a safe way to get an icon for Tomcat
+- TreeLogger logger = ui.getWebServerLogger("Tomcat", null);
+- // TODO(bruce): make tomcat work in terms of the modular launcher
+- String whyFailed = EmbeddedTomcatServer.start(isHeadless() ? getTopLogger()
+- : logger, getPort(), options, shouldAutoGenerateResources());
+-
- if (whyFailed != null) {
-- System.err.println(whyFailed);
-+ //if (whyFailed != null) {
-+ // System.err.println(whyFailed);
+- getTopLogger().log(TreeLogger.ERROR, "Starting Tomcat: " + whyFailed);
return -1;
- }
- return EmbeddedTomcatServer.getPort();
-+ //}
-+ //return EmbeddedTomcatServer.getPort();
}
@Override