fixes #1733, version information is now printed on clients "DebugConsole"

svn changeset:5147/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
index aefc931c4c07785cd6441ee74253018b32a43056..65b77505987f8aba8f8ed9896709b6a808972cce 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
@@ -75,4 +75,13 @@ public class ApplicationConfiguration {
         return conf;
     }
 
+    public native String getSerletVersion()
+    /*-{
+        return this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::versionInfo.toolkitVersion;
+    }-*/;
+
+    public native String getApplicationVersion()
+    /*-{
+        return this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::versionInfo.applicationVersion;
+    }-*/;
 }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index a65f5645203360774de78b32f88af3b1b2f5f8d1..cac97257308f4d00b14934f26eebba09401deedc 100755 (executable)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -107,7 +107,7 @@ public class ApplicationConnection {
         configuration = cnf;
 
         if (isDebugMode()) {
-            console = new DebugConsole(this);
+            console = new DebugConsole(this, cnf);
         } else {
             console = new NullConsole();
         }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java b/src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java
index 6bd0f247b31062ec9ee1354eebe5dca842750641..fb324f2167e72d465e3711b8f148f5dfcbd47168 100755 (executable)
--- a/src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/DebugConsole.java
@@ -18,9 +18,24 @@ import com.itmill.toolkit.terminal.gwt.client.ui.IWindow;
 
 public final class DebugConsole extends IWindow implements Console {
 
+    /**
+     * Builds number. For example 0-custom_tag in 5.0.0-custom_tag.
+     */
+    public static final String VERSION;
+
+    /* Initialize version numbers from string replaced by build-script. */
+    static {
+        if ("@VERSION@".equals("@" + "VERSION" + "@")) {
+            VERSION = "5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD";
+        } else {
+            VERSION = "@VERSION@";
+        }
+    }
+
     private final Panel panel;
 
-    public DebugConsole(ApplicationConnection client) {
+    public DebugConsole(ApplicationConnection client,
+            ApplicationConfiguration cnf) {
         super();
         this.client = client;
         panel = new FlowPanel();
@@ -30,6 +45,18 @@ public final class DebugConsole extends IWindow implements Console {
         setCaption("Debug window");
         minimize();
         show();
+
+        ;
+
+        log("Toolkit application servlet version: " + cnf.getSerletVersion());
+        log("Widget set is built on version: " + VERSION);
+        log("Application version: " + cnf.getApplicationVersion());
+
+        if (!cnf.getSerletVersion().equals(VERSION)) {
+            error("Warning: your widget set seems to be built with different "
+                    + "version than the one used on server. Unexpected "
+                    + "behavior may occur.");
+        }
     }
 
     private void minimize() {

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 9e071308a380bf6de070abbc8ae1ebb7a3ab8e6c..b9c7c15bc5a8928f30a8b1e9bc9142f445805601 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -851,13 +851,11 @@ public class ApplicationServlet extends HttpServlet {
             page.write("pathInfo: '" + pathInfo + "', ");
             page.write("themeUri:");
             page.write(themeUri != null ? "'" + themeUri + "'" : "null");
-            if (testingApplication) {
-                page.write(", versionInfo : {toolkitVersion:\"");
-                page.write(VERSION);
-                page.write("\",applicationVersion:\"");
-                page.write(application.getVersion());
-                page.write("\"}");
-            }
+            page.write(", versionInfo : {toolkitVersion:\"");
+            page.write(VERSION);
+            page.write("\",applicationVersion:\"");
+            page.write(application.getVersion());
+            page.write("\"}");
             page.write("};\n//]]>\n</script>\n");
 
             if (themeName != null) {
@@ -901,13 +899,11 @@ public class ApplicationServlet extends HttpServlet {
             page.write("pathInfo: '" + pathInfo + "', ");
             page.write("themeUri:");
             page.write(themeUri != null ? "'" + themeUri + "'" : "null");
-            if (testingApplication) {
-                page.write(", versionInfo : {toolkitVersion:\"");
-                page.write(VERSION);
-                page.write("\",applicationVersion:\"");
-                page.write(application.getVersion());
-                page.write("\"}");
-            }
+            page.write(", versionInfo : {toolkitVersion:\"");
+            page.write(VERSION);
+            page.write("\",applicationVersion:\"");
+            page.write(application.getVersion());
+            page.write("\"}");
             page.write("};\n//]]>\n</script>\n");
 
             if (themeName != null) {