From 44f1e40359fdc368a0f366608091b50ba89318ef Mon Sep 17 00:00:00 2001 From: Jani Laakso Date: Wed, 31 Oct 2007 19:21:11 +0000 Subject: [PATCH] Added com.itmill.toolkit.terminal.web.ApplicationServlet which eases running Millstone3, Toolkit 4 projects without requiring changes to web.xml BUT prints [WARNING] Compatiblity class in use. Please use com.itmill.toolkit.terminal.gwt.server.ApplicationServlet instead. You probably need to update your web.xml. Moved Log class to better place, opened it as public so whole Toolkit may use it (I consider it's not a major thing if Toolkit users see it aswell) svn changeset:2649/svn branch:trunk --- .../{terminal/gwt/server => }/Log.java | 14 ++++----- .../gwt/server/ApplicationServlet.java | 2 +- .../gwt/server/CommunicationManager.java | 1 + .../terminal/web/ApplicationServlet.java | 31 +++++++++++++++++++ 4 files changed, 40 insertions(+), 8 deletions(-) rename src/com/itmill/toolkit/{terminal/gwt/server => }/Log.java (89%) create mode 100644 src/com/itmill/toolkit/terminal/web/ApplicationServlet.java diff --git a/src/com/itmill/toolkit/terminal/gwt/server/Log.java b/src/com/itmill/toolkit/Log.java similarity index 89% rename from src/com/itmill/toolkit/terminal/gwt/server/Log.java rename to src/com/itmill/toolkit/Log.java index 5fe6417dad..1f3acd11df 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/Log.java +++ b/src/com/itmill/toolkit/Log.java @@ -26,7 +26,7 @@ ********************************************************************** */ -package com.itmill.toolkit.terminal.gwt.server; +package com.itmill.toolkit; /** *

@@ -57,7 +57,7 @@ package com.itmill.toolkit.terminal.gwt.server; * @VERSION@ * @since 5.0 */ -class Log { +public class Log { private static boolean useStdOut = true; @@ -77,7 +77,7 @@ class Log { * @param message * the Message String to be logged. */ - static synchronized void warn(java.lang.String message) { + public static synchronized void warn(java.lang.String message) { if (Log.useStdOut) System.out.println(LOG_MSG_WARN + " " + message); } @@ -88,7 +88,7 @@ class Log { * @param message * the Message String to be logged. */ - static synchronized void debug(java.lang.String message) { + public static synchronized void debug(java.lang.String message) { if (Log.useStdOut) System.out.println(LOG_MSG_DEBUG + " " + message); } @@ -99,7 +99,7 @@ class Log { * @param message * the Message String to be logged. */ - static synchronized void info(java.lang.String message) { + public static synchronized void info(java.lang.String message) { if (Log.useStdOut) System.out.println(LOG_MSG_INFO + " " + message); } @@ -112,7 +112,7 @@ class Log { * @param e * the Exception to be logged. */ - static synchronized void except(java.lang.String message, Exception e) { + public static synchronized void except(java.lang.String message, Exception e) { if (Log.useStdOut) { System.out.println(LOG_MSG_EXCEPT + " " + message); e.printStackTrace(); @@ -125,7 +125,7 @@ class Log { * @param message * the Message String to be logged. */ - static synchronized void error(java.lang.String message) { + public static synchronized void error(java.lang.String message) { if (Log.useStdOut) System.out.println(LOG_MSG_ERROR + " " + message); } diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index ef715ca475..c859d2a0b5 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java @@ -29,7 +29,6 @@ package com.itmill.toolkit.terminal.gwt.server; import java.io.BufferedWriter; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -55,6 +54,7 @@ import javax.servlet.http.HttpSession; import org.xml.sax.SAXException; import com.itmill.toolkit.Application; +import com.itmill.toolkit.Log; import com.itmill.toolkit.external.org.apache.commons.fileupload.servlet.ServletFileUpload; import com.itmill.toolkit.service.FileTypeResolver; import com.itmill.toolkit.terminal.DownloadStream; diff --git a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java index 38a46258e4..33fab13123 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java @@ -67,6 +67,7 @@ import com.itmill.toolkit.external.org.apache.commons.fileupload.ProgressListene import com.itmill.toolkit.external.org.apache.commons.fileupload.servlet.ServletFileUpload; import com.itmill.toolkit.Application; +import com.itmill.toolkit.Log; import com.itmill.toolkit.Application.WindowAttachEvent; import com.itmill.toolkit.Application.WindowDetachEvent; import com.itmill.toolkit.terminal.DownloadStream; diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java new file mode 100644 index 0000000000..312f41d850 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java @@ -0,0 +1,31 @@ +package com.itmill.toolkit.terminal.web; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; + +import com.itmill.toolkit.Log; + +/** + * This package and servlet is only provided for backward compatibility. Since + * Toolkit version 5.0 you should use + * com.itmill.toolkit.terminal.gwt.server.ApplicationServlet instead of this + * class. + * + * @author IT Mill Ltd. + * @version + * @VERSION@ + * @since 5.0 + */ +public class ApplicationServlet extends + com.itmill.toolkit.terminal.gwt.server.ApplicationServlet { + + private static final long serialVersionUID = -1471357707917217303L; + + @Override + public void init(ServletConfig servletConfig) throws ServletException { + Log + .warn("Compatiblity class in use. Please use com.itmill.toolkit.terminal.gwt.server.ApplicationServlet instead. You probably need to update your web.xml."); + super.init(servletConfig); + } + +} -- 2.39.5