toolkitVersion -> vaadinVersion

svn changeset:7815/svn branch:6.0

diff --git a/WebContent/multiapp.html b/WebContent/multiapp.html
index 8e37550e4119d1635327be9fe2e0f899297067a4..ace7231d5d90afe7f5eac706bb64020e3f78134a 100644 (file)
--- a/WebContent/multiapp.html
+++ b/WebContent/multiapp.html
@@ -9,19 +9,19 @@
                                appUri:'/FeatureBrowser', 
                                pathInfo: '/', 
                                themeUri: '/VAADIN/themes/example', 
-                               versionInfo : {toolkitVersion:"5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
+                               versionInfo : {vaadinVersion:"6.0.0-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
                        },
                        'calc' :{
                                appUri:'/Calc', 
                                pathInfo: '/', 
                                themeUri: '/VAADIN/themes/example', 
-                               versionInfo : {toolkitVersion:"5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
+                               versionInfo : {vaadinVersion:"6-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
                        },
                        'hello' :{
                                appUri:'/HelloWorld', 
                                pathInfo: '/', 
                                themeUri: '/VAADIN/themes/example', 
-                               versionInfo : {toolkitVersion:"5.9.9-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
+                               versionInfo : {vaadinVersion:"6.0.0-INTERNAL-NONVERSIONED-DEBUG-BUILD",applicationVersion:"NONVERSIONED"}
                        }
 
                        

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index e27283258a4e49e2211b7c115e4e66db34173186..0eb505761b5d9388dc3f6d8929dcca97baf8192f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -187,7 +187,7 @@ public class ApplicationConfiguration {
 
     public native String getServletVersion()
     /*-{
-        return this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::versionInfo.toolkitVersion;
+        return this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::versionInfo.vaadinVersion;
     }-*/;
 
     public native String getApplicationVersion()

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 6180993faa25d09c19920d45ace467277ba34ee6..96c0440b57a4556c18ac74f26576cc3f1b0e4325 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -1222,7 +1222,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
             }
             page.write("themeUri:");
             page.write(themeUri != null ? "'" + themeUri + "'" : "null");
-            page.write(", versionInfo : {toolkitVersion:\"");
+            page.write(", versionInfo : {vaadinVersion:\"");
             page.write(VERSION);
             page.write("\",applicationVersion:\"");
             page.write(application.getVersion());
@@ -1295,7 +1295,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
             }
             page.write("themeUri:");
             page.write(themeUri != null ? "'" + themeUri + "'" : "null");
-            page.write(", versionInfo : {toolkitVersion:\"");
+            page.write(", versionInfo : {vaadinVersion:\"");
             page.write(VERSION);
             page.write("\",applicationVersion:\"");
             page.write(application.getVersion());