From 55afccf800425f66437fdffe3212b6b92fbeb1e5 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Mon, 3 Sep 2012 09:57:35 +0300
Subject: Remove Application.getVersion() (#9402)

---
 server/src/com/vaadin/Application.java             | 17 +++--------------
 server/src/com/vaadin/server/BootstrapHandler.java |  1 -
 2 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'server')

diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java
index 90f354e180..f8ff812c94 100644
--- a/server/src/com/vaadin/Application.java
+++ b/server/src/com/vaadin/Application.java
@@ -61,10 +61,10 @@ import com.vaadin.server.CombinedRequest;
 import com.vaadin.server.DeploymentConfiguration;
 import com.vaadin.server.GlobalResourceHandler;
 import com.vaadin.server.RequestHandler;
+import com.vaadin.server.ServletApplicationContext;
 import com.vaadin.server.Terminal;
 import com.vaadin.server.UIProvider;
 import com.vaadin.server.VariableOwner;
-import com.vaadin.server.ServletApplicationContext;
 import com.vaadin.server.WrappedRequest;
 import com.vaadin.server.WrappedRequest.BrowserDetails;
 import com.vaadin.server.WrappedResponse;
@@ -867,8 +867,8 @@ public class Application implements Terminal.ErrorListener, Serializable {
      * </p>
      * <p>
      * By default, when you are deploying your application to a servlet
-     * container, the implementation class is {@link ServletApplicationContext} -
-     * you can safely cast to this class and use the methods from there. When
+     * container, the implementation class is {@link ServletApplicationContext}
+     * - you can safely cast to this class and use the methods from there. When
      * you are deploying your application as a portlet, context implementation
      * is {@link PortletApplicationContext}.
      * </p>
@@ -879,17 +879,6 @@ public class Application implements Terminal.ErrorListener, Serializable {
         return context;
     }
 
-    /**
-     * Override this method to return correct version number of your
-     * Application. Version information is delivered for example to Testing
-     * Tools test results. By default this returns a string "NONVERSIONED".
-     * 
-     * @return version string
-     */
-    public String getVersion() {
-        return "NONVERSIONED";
-    }
-
     /**
      * Gets the application error handler.
      * 
diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java
index 60ac40916c..df46bb12ee 100644
--- a/server/src/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/server/BootstrapHandler.java
@@ -401,7 +401,6 @@ public abstract class BootstrapHandler implements RequestHandler {
 
         JSONObject versionInfo = new JSONObject();
         versionInfo.put("vaadinVersion", Version.getFullVersion());
-        versionInfo.put("applicationVersion", application.getVersion());
         appConfig.put("versionInfo", versionInfo);
 
         appConfig.put("widgetset", context.getWidgetsetName());
-- 
cgit v1.2.3